eks_cli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94bf410f44d38de95506f7414f0716417cd5de42523ecc1a3e0c1eef024e4790
-  data.tar.gz: b551d343e9fd3c4b79a9e1be6e0f0b85bf09a0fa0deb2125e8a7dacb5b875fe0
+  metadata.gz: 6f3f3482b85b1f958736fc15f42ca78a0758bb260f41fc2b9a82b8ac4d41290d
+  data.tar.gz: f8716d74941af68b46f7b969af80d5d0747f140f4eaf09d0ca5d32d32c66f4d7
 SHA512:
-  metadata.gz: 7e3b84be234a00bc579f558b9e949d96369b212865c9e993b0df3a4d21968fb15d7e6c46116d278f3fd55247c9f3d14c0904d88a74c58bcf84cb59f39c6c16a9
-  data.tar.gz: d45a18369055ec099b11aa0224a750f8f14b265faaf5ec35330b950a23aa8f5bd8e7330ebbb81f4e93db84db83cd2114b8c3c39d9dd80e9b4c698aee8e9f8f4e
+  metadata.gz: 7632811983ed89098c1be2f08cc92f612641863ce0aa90d0b6c19dfbdf3d6de75a9e06a1133f673db9f0a90205511b930de790db47a099b253b24f4c043b8bce
+  data.tar.gz: d4592a8ee34300d7b87b63aa32146bd5fcfbd150760ee36ea4a8a3e86332566aa6b2a93173cdbb6199cd7ab798d5739f8c8f1e1fc5e06c4c41dea147d2e3d61e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eks_cli (0.2.9)
+    eks_cli (0.3.1)
       activesupport (= 5.2.1.1)
       aws-sdk-autoscaling (= 1.13.0)
       aws-sdk-cloudformation (= 1.13.0)
@@ -20,20 +20,20 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    aws-eventstream (1.0.1)
-    aws-partitions (1.125.0)
+    aws-eventstream (1.0.2)
+    aws-partitions (1.144.0)
     aws-sdk-autoscaling (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-cloudformation (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.44.0)
-      aws-eventstream (~> 1.0)
+    aws-sdk-core (3.48.2)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-ec2 (1.62.0)
       aws-sdk-core (~> 3, >= 3.39.0)
@@ -41,8 +41,9 @@ GEM
     aws-sdk-route53 (1.16.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
-    concurrent-ruby (1.1.4)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    concurrent-ruby (1.1.5)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     http (3.3.0)
@@ -57,7 +58,7 @@ GEM
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.2.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     jmespath (1.4.0)
@@ -92,4 +93,4 @@ DEPENDENCIES
   eks_cli!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/lib/assets/cf/eks_cluster.yaml.erb

@@ -192,7 +192,7 @@ Resources:
           - !Ref Subnet02
           - !Ref Subnet03
       RoleArn: !GetAtt AWSServiceRoleForAmazonEKS.Arn
-      Version: "1.10"
+      Version: "1.12"
 
   NodeGroupsInClusterSecurityGroup:
     Type: AWS::EC2::SecurityGroup

data/lib/assets/cf/nodegroup.yaml

@@ -1,6 +1,6 @@
 ---
-AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Amazon EKS - Node Group'
+AWSTemplateFormatVersion: 2010-09-09
+Description: Amazon EKS - Node Group
 
 Parameters:
 
@@ -16,107 +16,107 @@ Parameters:
     Description: EC2 instance type for the node instances
     Type: String
     Default: t3.medium
-    AllowedValues:
-    - t2.small
-    - t2.medium
-    - t2.large
-    - t2.xlarge
-    - t2.2xlarge
-    - t3.nano
-    - t3.micro
-    - t3.small
-    - t3.medium
-    - t3.large
-    - t3.xlarge
-    - t3.2xlarge
-    - m3.medium
-    - m3.large
-    - m3.xlarge
-    - m3.2xlarge
-    - m4.large
-    - m4.xlarge
-    - m4.2xlarge
-    - m4.4xlarge
-    - m4.10xlarge
-    - m5.large
-    - m5.xlarge
-    - m5.2xlarge
-    - m5.4xlarge
-    - m5.12xlarge
-    - m5.24xlarge
-    - c4.large
-    - c4.xlarge
-    - c4.2xlarge
-    - c4.4xlarge
-    - c4.8xlarge
-    - c5.large
-    - c5.xlarge
-    - c5.2xlarge
-    - c5.4xlarge
-    - c5.9xlarge
-    - c5.18xlarge
-    - i3.large
-    - i3.xlarge
-    - i3.2xlarge
-    - i3.4xlarge
-    - i3.8xlarge
-    - i3.16xlarge
-    - r3.xlarge
-    - r3.2xlarge
-    - r3.4xlarge
-    - r3.8xlarge
-    - r4.large
-    - r4.xlarge
-    - r4.2xlarge
-    - r4.4xlarge
-    - r4.8xlarge
-    - r4.16xlarge
-    - x1.16xlarge
-    - x1.32xlarge
-    - p2.xlarge
-    - p2.8xlarge
-    - p2.16xlarge
-    - p3.2xlarge
-    - p3.8xlarge
-    - p3.16xlarge
-    - r5.large
-    - r5.xlarge
-    - r5.2xlarge
-    - r5.4xlarge
-    - r5.12xlarge
-    - r5.24xlarge
-    - r5d.large
-    - r5d.xlarge
-    - r5d.2xlarge
-    - r5d.4xlarge
-    - r5d.12xlarge
-    - r5d.24xlarge
-    - z1d.large
-    - z1d.xlarge
-    - z1d.2xlarge
-    - z1d.3xlarge
-    - z1d.6xlarge
-    - z1d.12xlarge
     ConstraintDescription: Must be a valid EC2 instance type
+    AllowedValues:
+      - t2.small
+      - t2.medium
+      - t2.large
+      - t2.xlarge
+      - t2.2xlarge
+      - t3.nano
+      - t3.micro
+      - t3.small
+      - t3.medium
+      - t3.large
+      - t3.xlarge
+      - t3.2xlarge
+      - m3.medium
+      - m3.large
+      - m3.xlarge
+      - m3.2xlarge
+      - m4.large
+      - m4.xlarge
+      - m4.2xlarge
+      - m4.4xlarge
+      - m4.10xlarge
+      - m5.large
+      - m5.xlarge
+      - m5.2xlarge
+      - m5.4xlarge
+      - m5.12xlarge
+      - m5.24xlarge
+      - c4.large
+      - c4.xlarge
+      - c4.2xlarge
+      - c4.4xlarge
+      - c4.8xlarge
+      - c5.large
+      - c5.xlarge
+      - c5.2xlarge
+      - c5.4xlarge
+      - c5.9xlarge
+      - c5.18xlarge
+      - i3.large
+      - i3.xlarge
+      - i3.2xlarge
+      - i3.4xlarge
+      - i3.8xlarge
+      - i3.16xlarge
+      - r3.xlarge
+      - r3.2xlarge
+      - r3.4xlarge
+      - r3.8xlarge
+      - r4.large
+      - r4.xlarge
+      - r4.2xlarge
+      - r4.4xlarge
+      - r4.8xlarge
+      - r4.16xlarge
+      - x1.16xlarge
+      - x1.32xlarge
+      - p2.xlarge
+      - p2.8xlarge
+      - p2.16xlarge
+      - p3.2xlarge
+      - p3.8xlarge
+      - p3.16xlarge
+      - r5.large
+      - r5.xlarge
+      - r5.2xlarge
+      - r5.4xlarge
+      - r5.12xlarge
+      - r5.24xlarge
+      - r5d.large
+      - r5d.xlarge
+      - r5d.2xlarge
+      - r5d.4xlarge
+      - r5d.12xlarge
+      - r5d.24xlarge
+      - z1d.large
+      - z1d.xlarge
+      - z1d.2xlarge
+      - z1d.3xlarge
+      - z1d.6xlarge
+      - z1d.12xlarge
 
   NodeAutoScalingGroupMinSize:
-    Type: Number
     Description: Minimum size of Node Group ASG.
+    Type: Number
     Default: 1
 
   NodeAutoScalingGroupMaxSize:
-    Type: Number
     Description: Maximum size of Node Group ASG. Set to at least 1 greater than NodeAutoScalingGroupDesiredCapacity.
+    Type: Number
     Default: 4
 
   NodeAutoScalingGroupDesiredCapacity:
-    Type: Number
     Description: Desired capacity of Node Group ASG.
+    Type: Number
     Default: 3
 
   NodeVolumeSize:
-    Type: Number
     Description: Node volume size
+    Type: Number
     Default: 20
 
   ClusterName:
@@ -125,8 +125,8 @@ Parameters:
 
   BootstrapArguments:
     Description: Arguments to pass to the bootstrap script. See files/bootstrap.sh in https://github.com/awslabs/amazon-eks-ami
-    Default: ""
     Type: String
+    Default: ""
 
   NodeGroupName:
     Description: Unique identifier for the Node Group.
@@ -153,17 +153,16 @@ Parameters:
     Type: CommaDelimitedList
 
 Metadata:
+
   AWS::CloudFormation::Interface:
     ParameterGroups:
-      -
-        Label:
-          default: "EKS Cluster"
+      - Label:
+          default: EKS Cluster
         Parameters:
           - ClusterName
           - ClusterControlPlaneSecurityGroup
-      -
-        Label:
-          default: "Worker Node Configuration"
+      - Label:
+          default: Worker Node Configuration
         Parameters:
           - NodeGroupName
           - NodeAutoScalingGroupMinSize
@@ -176,9 +175,8 @@ Metadata:
           - BootstrapArguments
           - NodeGroupIAMPolicies
           - ClusterSecurityGroup
-      -
-        Label:
-          default: "Worker Network Configuration"
+      - Label:
+          default: Worker Network Configuration
         Parameters:
           - VpcId
           - Subnets
@@ -190,20 +188,18 @@ Resources:
     Properties:
       Path: "/"
       Roles:
-      - !Ref NodeInstanceRole
+        - !Ref NodeInstanceRole
 
   NodeInstanceRole:
     Type: AWS::IAM::Role
     Properties:
       AssumeRolePolicyDocument:
-        Version: '2012-10-17'
+        Version: 2012-10-17
         Statement:
-        - Effect: Allow
-          Principal:
-            Service:
-            - ec2.amazonaws.com
-          Action:
-          - sts:AssumeRole
+          - Effect: Allow
+            Principal:
+              Service: ec2.amazonaws.com
+            Action: sts:AssumeRole
       Path: "/"
       ManagedPolicyArns:
         Ref: NodeGroupIAMPolicies
@@ -212,11 +208,10 @@ Resources:
     Type: AWS::EC2::SecurityGroup
     Properties:
       GroupDescription: Security group for all nodes in the cluster
-      VpcId:
-        !Ref VpcId
+      VpcId: !Ref VpcId
       Tags:
-      - Key: !Sub "kubernetes.io/cluster/${ClusterName}"
-        Value: 'owned'
+        - Key: !Sub kubernetes.io/cluster/${ClusterName}
+          Value: owned
 
   NodeSecurityGroupIngress:
     Type: AWS::EC2::SecurityGroupIngress
@@ -225,7 +220,7 @@ Resources:
       Description: Allow node to communicate with each other
       GroupId: !Ref NodeSecurityGroup
       SourceSecurityGroupId: !Ref NodeSecurityGroup
-      IpProtocol: '-1'
+      IpProtocol: -1
       FromPort: 0
       ToPort: 65535
 
@@ -291,33 +286,32 @@ Resources:
       LaunchConfigurationName: !Ref NodeLaunchConfig
       MinSize: !Ref NodeAutoScalingGroupMinSize
       MaxSize: !Ref NodeAutoScalingGroupMaxSize
-      VPCZoneIdentifier:
-        !Ref Subnets
+      VPCZoneIdentifier: !Ref Subnets
       Tags:
-      - Key: Name
-        Value: !Sub "${ClusterName}-${NodeGroupName}-Node"
-        PropagateAtLaunch: 'true'
-      - Key: !Sub 'kubernetes.io/cluster/${ClusterName}'
-        Value: 'owned'
-        PropagateAtLaunch: 'true'
+        - Key: Name
+          Value: !Sub ${ClusterName}-${NodeGroupName}-Node
+          PropagateAtLaunch: true
+        - Key: !Sub kubernetes.io/cluster/${ClusterName}
+          Value: owned
+          PropagateAtLaunch: true
     UpdatePolicy:
       AutoScalingRollingUpdate:
-        MaxBatchSize: '1'
+        MaxBatchSize: 1
         MinInstancesInService: !Ref NodeAutoScalingGroupDesiredCapacity
-        PauseTime: 'PT5M'
+        PauseTime: PT5M
 
   NodeLaunchConfig:
     Type: AWS::AutoScaling::LaunchConfiguration
     Properties:
-      AssociatePublicIpAddress: 'true'
+      AssociatePublicIpAddress: true
       IamInstanceProfile: !Ref NodeInstanceProfile
       ImageId: !Ref NodeImageId
       InstanceType: !Ref NodeInstanceType
       KeyName: !Ref KeyName
       InstanceMonitoring: false
       SecurityGroups:
-      - !Ref NodeSecurityGroup
-      - !Ref ClusterSecurityGroup
+        - !Ref NodeSecurityGroup
+        - !Ref ClusterSecurityGroup
       BlockDeviceMappings:
         - DeviceName: /dev/xvda
           Ebs:
@@ -330,15 +324,13 @@ Resources:
             #!/bin/bash
             set -o xtrace
             /etc/eks/bootstrap.sh ${ClusterName} ${BootstrapArguments}
-            /opt/aws/bin/cfn-signal --exit-code $? \
-                     --stack  ${AWS::StackName} \
-                     --resource NodeGroup  \
-                     --region ${AWS::Region}
 
 Outputs:
+
   NodeInstanceRole:
     Description: The node instance role
     Value: !GetAtt NodeInstanceRole.Arn
+
   NodeSecurityGroup:
     Description: The security group for the node group
     Value: !Ref NodeSecurityGroup

data/lib/assets/k8s/{cni_1_2_1.yaml.erb → cni/ds.yaml.erb}

@@ -1,5 +1,7 @@
+---
 kind: DaemonSet
 apiVersion: apps/v1
+# kubernetes versions before 1.9.0 should use extensions/v1beta1
 metadata:
   name: aws-node
   namespace: kube-system
@@ -23,7 +25,7 @@ spec:
       tolerations:
       - operator: Exists
       containers:
-      - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.2.1
+      - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.4.1
         imagePullPolicy: Always
         ports:
         - containerPort: 61678

data/lib/assets/k8s/cni/rest.yaml

@@ -0,0 +1,60 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+# kubernetes versions before 1.8.0 should use rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: aws-node
+rules:
+- apiGroups:
+  - crd.k8s.amazonaws.com
+  resources:
+  - "*"
+  - namespaces
+  verbs:
+  - "*"
+- apiGroups: [""]
+  resources:
+  - pods
+  - nodes
+  - namespaces
+  verbs: ["list", "watch", "get"]
+- apiGroups: ["extensions"]
+  resources:
+  - daemonsets
+  verbs: ["list", "watch"]
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: aws-node
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+# kubernetes versions before 1.8.0 should use rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: aws-node
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: aws-node
+subjects:
+- kind: ServiceAccount
+  name: aws-node
+  namespace: kube-system
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: eniconfigs.crd.k8s.amazonaws.com
+spec:
+  scope: Cluster
+  group: crd.k8s.amazonaws.com
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+  names:
+    plural: eniconfigs
+    singular: eniconfig
+    kind: ENIConfig

data/lib/assets/k8s/dns_autoscaler.dep.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-       k8s-app: dns-autoscaler
+      k8s-app: dns-autoscaler
   template:
     metadata:
       labels:
@@ -18,14 +18,14 @@ spec:
       - name: autoscaler
         image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.1
         resources:
-            requests:
-                cpu: "20m"
-                memory: "10Mi"
+          requests:
+            cpu: 20m
+            memory: 10Mi
         command:
-          - /cluster-proportional-autoscaler
-          - --namespace=kube-system
-          - --configmap=dns-autoscaler
-          - --target=Deployment/kube-dns
-          - --default-params={"linear":{"coresPerReplica":64,"nodesPerReplica":4,"min":3}}
-          - --logtostderr=true
-          - --v=2
+        - /cluster-proportional-autoscaler
+        - --namespace=kube-system
+        - --configmap=dns-autoscaler
+        - --target=Deployment/coredns
+        - --default-params={"linear":{"coresPerReplica":64,"nodesPerReplica":4,"min":3}}
+        - --logtostderr=true
+        - --v=2

data/lib/assets/k8s/nvidia_device_plugin.yaml

@@ -1,7 +1,7 @@
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: nvidia-device-plugin-daemonset
+  name: nvidia-device-plugin-daemonset-1.12
   namespace: kube-system
 spec:
   selector:
@@ -20,10 +20,9 @@ spec:
       tolerations:
       # Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
       # This, along with the annotation above marks this pod as a critical add-on.
-      - key: CriticalAddonsOnly
-        operator: Exists
+      - operator: Exists
       containers:
-      - image: nvidia/k8s-device-plugin:1.10
+      - image: nvidia/k8s-device-plugin:1.11
         name: nvidia-device-plugin-ctr
         securityContext:
           allowPrivilegeEscalation: false

data/lib/eks_cli/cli.rb

@@ -37,7 +37,7 @@ module EksCli
     option :subnet3_az, type: :string, desc: "availability zone for subnet 03"
     option :open_ports, type: :array, default: [], desc: "open ports on cluster nodes (eg 22 for SSH access)"
     option :enable_gpu, type: :boolean, default: false, desc: "installs nvidia device plugin daemon set"
-    option :create_default_storage_class, type: :boolean, default: true, desc: "creates a default gp2 storage class"
+    option :create_default_storage_class, type: :boolean, default: false, desc: "creates a default gp2 storage class"
     option :create_dns_autoscaler, type: :boolean, default: true, desc: "creates dns autoscaler on the cluster"
     option :warm_ip_target, type: :numeric, desc: "set a default custom warm ip target for CNI"
     def create
@@ -103,6 +103,7 @@ module EksCli
     option :min, type: :numeric, default: 1, desc: "minimum number of nodes on the nodegroup"
     option :max, type: :numeric, default: 1, desc: "maximum number of nodes on the nodegroup"
     option :desired, type: :numeric, default: 1, desc: "desired number of nodes on the nodegroup"
+    option :enable_docker_bridge, type: :boolean, default: false, desc: "pass --enable-docker-bridge true on bootstrap.sh (https://github.com/kubernetes/kubernetes/issues/40182))"
     option :yes, type: :boolean, default: false, desc: "perform nodegroup creation"
     def create_nodegroup
       opts = options.dup
@@ -126,7 +127,7 @@ module EksCli
 
     desc "delete-nodegroup", "deletes cloudformation stack for nodegroup"
     option :all, type: :boolean, default: false, desc: "delete all nodegroups. can't be used with --name"
-    option :name, type: :string, desc: "delete a specific nodegroup. can't be used with --all"
+    option :group_name, type: :string, desc: "delete a specific nodegroup. can't be used with --all"
     def delete_nodegroup
       nodegroups.each(&:delete)
     end

data/lib/eks_cli/config.rb

@@ -62,7 +62,7 @@ module EksCli
     end
 
     def update_nodegroup(options)
-      options = options.slice("ami", "group_name", "instance_type", "subnets", "ssh_key_name", "volume_size", "taints", "min", "max", "desired")
+      options = options.slice("ami", "group_name", "instance_type", "subnets", "ssh_key_name", "volume_size", "taints", "min", "max", "enable_docker_bridge", "desired")
       raise "bad nodegroup name #{options["group_name"]}" if options["group_name"] == nil || options["group_name"].empty?
       write({groups: { options["group_name"] => options }}, :groups)
     end

data/lib/eks_cli/k8s/client.rb

@@ -44,7 +44,8 @@ module EksCli
 
       def update_cni
         Log.info "updating cni"
-        Log.info self.update_daemon_set(resource_from_erb("k8s/cni_1_2_1.yaml.erb", {custom_warm_ip_target: config["warm_ip_target"]}))
+        Log.info self.update_daemon_set(resource_from_erb("k8s/cni/ds.yaml.erb", {custom_warm_ip_target: config["warm_ip_target"]}))
+        Log.info `kubectl config use-context #{config["cluster_arn"]} && kubectl apply -f #{file_path("/k8s/cni/rest.yaml")}`
       end
 
       def wait_for_cluster

data/lib/eks_cli/nodegroup.rb

@@ -25,14 +25,14 @@ module EksCli
          iam_policies: "NodeGroupIAMPolicies",
          bootstrap_args: "BootstrapArguments"}
 
-    AMIS = {"us-west-2" => "ami-07af9511082779ae7",
-            "us-east-1" => "ami-027792c3cc6de7b5b",
-            "us-east-2" => "ami-036130f4127a367f7",
+    AMIS = {"us-west-2" => "ami-0923e4b35a30a5f53",
+            "us-east-1" => "ami-0abcb9f9190e867ab",
+            "us-east-2" => "ami-04ea7cb66af82ae4a",
             "us-west-1" => "ami-03612357ac9da2c7d"}
 
-    GPU_AMIS = {"us-west-2" => "ami-08754f7ac73185331",
-                "us-east-1" => "ami-03c499c67bc65c089",
-                "us-east-2" => "ami-081210a2fd7f3c487",
+    GPU_AMIS = {"us-west-2" => "ami-0bebf2322fd52a42e",
+                "us-east-1" => "ami-0cb7959f92429410a",
+                "us-east-2" => "ami-0118b61dc2312dee2",
                 "us-west-1" => "ami-047637529a86c7237"}
 
     EKS_IAM_POLICIES = %w{AmazonEKSWorkerNodePolicy
@@ -130,8 +130,12 @@ module EksCli
       @group["bootstrap_args"] = bootstrap_args
       @group["ami"] ||= default_ami
       @group["iam_policies"] = iam_policies
-      @group.except("taints").inject([]) do |params, (k, v)|
-        params << build_param(k, v)
+      @group.inject([]) do |params, (k, v)|
+        if param = build_param(k, v)
+          params << param
+        else
+          params
+        end
       end
     end
 
@@ -140,11 +144,13 @@ module EksCli
     end
 
     def bootstrap_args
-      flags = "--node-labels=kubernetes.io/role=node,eks/node-group=#{@group["group_name"].downcase}"
+      kubelet_flags = "--node-labels=kubernetes.io/role=node,eks/node-group=#{@group["group_name"].downcase}"
       if taints = @group["taints"]
-        flags = "#{flags} --register-with-taints=#{taints}"
+        kubelet_flags = "#{kubelet_flags} --register-with-taints=#{taints}"
       end
-      "--kubelet-extra-args \"#{flags}\"" 
+      flags = "--kubelet-extra-args \"#{kubelet_flags}\"" 
+      flags = "#{flags} --enable-docker-bridge true" if @group["enable_docker_bridge"]
+      flags
     end
 
     def add_bootstrap_args(group)
@@ -153,8 +159,10 @@ module EksCli
     end
 
     def build_param(k, v)
-      {parameter_key: T[k.to_sym],
-       parameter_value: v.to_s}
+      if key = T[k.to_sym]
+        {parameter_key: key,
+         parameter_value: v.to_s}
+      end
     end
 
     def default_ami

data/lib/eks_cli/version.rb

@@ -1,3 +1,3 @@
 module EksCli
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/eks_cli/vpc/client.rb

@@ -53,7 +53,7 @@ module EksCli
               to_port: "-1",
               user_id_group_pairs: [
                 {
-                  description: "Accept all traffic from new EKS cluster VPC",
+                  description: "Accept all traffic from nodes on EKS cluster #{@cluster_name}",
                   group_id: config["nodes_sg_id"],
                   vpc_id: new_vpc.id,
                   vpc_peering_connection_id: peering_connection_id,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eks_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Erez Rabih
@@ -152,7 +152,8 @@ files:
 - eks_cli.gemspec
 - lib/assets/cf/eks_cluster.yaml.erb
 - lib/assets/cf/nodegroup.yaml
-- lib/assets/k8s/cni_1_2_1.yaml.erb
+- lib/assets/k8s/cni/ds.yaml.erb
+- lib/assets/k8s/cni/rest.yaml
 - lib/assets/k8s/default_storage_class.yaml
 - lib/assets/k8s/dns_autoscaler.dep.yaml
 - lib/assets/k8s/nvidia_device_plugin.yaml
@@ -192,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Make EKS great again!