eks_cli 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a6712d3d7d38d8223373b57caa29162bbb65f47
-  data.tar.gz: be68729009405ad954b74db051e40449cd86ee5e
+  metadata.gz: f5be6fcc878fec18884e01562e9e1470cfa58183
+  data.tar.gz: 8cdaaa2c3432730502855e5e27753efc8729e8ab
 SHA512:
-  metadata.gz: 281186a4e016c5576fdfa53066ce821c90e6518286fc7bf8dccefc2f71bf2002261ea5d49e5b298b43d15295cc382dbe8a72d99f27d5ab3ae63c5049ab96bdb5
-  data.tar.gz: 9e8d791bd97640a14630c95ce4e5ec805430c1bfac5c77bda0a969e72c4abeb02f6bd9b5f64e6452eb839cf6f7d300ce129a790627a673fe1440790e258aedd5
+  metadata.gz: ee939489d068d59e5379a7ab9d52916e7ec4f129a8a2242fc702ef713772c04c7a490a3382641114701059a163aec7be68c8d3baec15f2ea178c8e178ba0866f
+  data.tar.gz: 16a4702bc98dd7cad06ed2ed034c4bc0ca05198b569a55a561de5429d7002ae9ece4f5e1cf3d50716fdd41c8ae65b6c957a41e75fb4f7c0351589a959773c574

data/eks_cli.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency 'thor', '0.20.3'
   s.add_dependency 'aws-sdk-iam', '1.12.0'
-  s.add_dependency 'aws-sdk-eks', '1.8.0'
+  s.add_dependency 'aws-sdk-eks', '1.9.0'
   s.add_dependency 'aws-sdk-ec2', '1.62.0'
   s.add_dependency 'aws-sdk-cloudformation', '1.13.0'
   s.add_dependency 'aws-sdk-route53', '1.16.0'

data/lib/assets/nodegroup_cf_template.yaml

@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: '2010-09-09'
-Description: 'Amazon EKS - Node Group - Released 2018-08-30'
+Description: 'Amazon EKS - Node Group'
 
 Parameters:
 
@@ -15,13 +15,20 @@ Parameters:
   NodeInstanceType:
     Description: EC2 instance type for the node instances
     Type: String
-    Default: t2.medium
+    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
@@ -72,6 +79,24 @@ Parameters:
     - 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
 
   NodeAutoScalingGroupMinSize:
@@ -81,7 +106,12 @@ Parameters:
 
   NodeAutoScalingGroupMaxSize:
     Type: Number
-    Description: Maximum size of Node Group ASG.
+    Description: Maximum size of Node Group ASG. Set to at least 1 greater than NodeAutoScalingGroupDesiredCapacity.
+    Default: 4
+
+  NodeAutoScalingGroupDesiredCapacity:
+    Type: Number
+    Description: Desired capacity of Node Group ASG.
     Default: 3
 
   NodeVolumeSize:
@@ -137,6 +167,7 @@ Metadata:
         Parameters:
           - NodeGroupName
           - NodeAutoScalingGroupMinSize
+          - NodeAutoScalingGroupDesiredCapacity
           - NodeAutoScalingGroupMaxSize
           - NodeInstanceType
           - NodeImageId
@@ -144,6 +175,7 @@ Metadata:
           - KeyName
           - BootstrapArguments
           - NodeGroupIAMPolicies
+          - ClusterSecurityGroup
       -
         Label:
           default: "Worker Network Configuration"
@@ -255,7 +287,7 @@ Resources:
   NodeGroup:
     Type: AWS::AutoScaling::AutoScalingGroup
     Properties:
-      DesiredCapacity: !Ref NodeAutoScalingGroupMaxSize
+      DesiredCapacity: !Ref NodeAutoScalingGroupDesiredCapacity
       LaunchConfigurationName: !Ref NodeLaunchConfig
       MinSize: !Ref NodeAutoScalingGroupMinSize
       MaxSize: !Ref NodeAutoScalingGroupMaxSize
@@ -270,8 +302,9 @@ Resources:
         PropagateAtLaunch: 'true'
     UpdatePolicy:
       AutoScalingRollingUpdate:
-        MinInstancesInService: '1'
         MaxBatchSize: '1'
+        MinInstancesInService: !Ref NodeAutoScalingGroupDesiredCapacity
+        PauseTime: 'PT5M'
 
   NodeLaunchConfig:
     Type: AWS::AutoScaling::LaunchConfiguration
@@ -305,4 +338,7 @@ 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/eks_cli/cli.rb

@@ -37,6 +37,7 @@ module EksCli
 
     desc "create", "creates a new EKS cluster"
     option :region, type: :string, default: "us-west-2", desc: "AWS region for EKS cluster"
+    option :kubernetes_version, type: :string, default: "1.10", desc: "EKS control plane version"
     option :cidr, type: :string, default: "192.168.0.0/16", desc: "CIRD block for cluster VPC"
     option :subnet1_az, type: :string, desc: "availability zone for subnet 01"
     option :subnet2_az, type: :string, desc: "availability zone for subnet 02"
@@ -46,7 +47,7 @@ module EksCli
     option :create_default_storage_class, type: :boolean, default: true, desc: "creates a default gp2 storage class"
     option :create_dns_autoscaler, type: :boolean, default: true, desc: "creates dns autoscaler on the cluster"
     def create
-      Config[cluster_name].bootstrap({region: options[:region]})
+      Config[cluster_name].bootstrap({region: options[:region], kubernetes_version: options[:kubernetes_version]})
       create_eks_role
       create_cluster_vpc
       create_eks_cluster
@@ -123,6 +124,7 @@ module EksCli
     option :volume_size, type: :numeric, default: 100, desc: "disk size for node group in GB"
     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 :yes, type: :boolean, default: false, desc: "perform nodegroup creation"
     def create_nodegroup
       opts = options.dup

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")
+      options = options.slice("ami", "group_name", "instance_type", "subnets", "ssh_key_name", "volume_size", "taints", "min", "max", "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/eks/cluster.rb

@@ -21,6 +21,7 @@ module EksCli
 
       def config
         {name: @cluster_name,
+         version: Config[@cluster_name]["kubernetes_version"],
          role_arn: Config[@cluster_name]["eks_role_arn"],
          resources_vpc_config: {
            subnet_ids: Config[@cluster_name]["subnets"],

data/lib/eks_cli/k8s/client.rb

@@ -43,18 +43,18 @@ module EksCli
 
       def wait_for_cluster
         Log.info "waiting for cluster #{@cluster_name} to respond"
-        ready = false
-        while !ready
+        successful_calls = 0
+        while successful_calls < 3
           begin
             res = self.get_services
             if res.count > 0
-              Log.info "#{@cluster_name} is up and running!"
-              ready = true
+              successful_calls += 1
             end
           rescue Kubeclient::HttpError
             Log.info "couldn't connect to server, retrying..."
           end
         end
+        Log.info "#{@cluster_name} is up and running!"
       end
 
       private

data/lib/eks_cli/nodegroup.rb

@@ -15,6 +15,7 @@ module EksCli
          nodes_sg_id: "ClusterSecurityGroup",
          min: "NodeAutoScalingGroupMinSize",
          max: "NodeAutoScalingGroupMaxSize",
+         desired: "NodeAutoScalingGroupDesiredCapacity",
          instance_type: "NodeInstanceType",
          ami: "NodeImageId",
          volume_size: "NodeVolumeSize",
@@ -25,15 +26,15 @@ module EksCli
          iam_policies: "NodeGroupIAMPolicies",
          bootstrap_args: "BootstrapArguments"}
 
-    AMIS = {"us-west-2" => "ami-0f54a2f7d2e9c88b3",
-            "us-east-1" => "ami-0a0b913ef3249b655",
-            "us-east-2" => "ami-0958a76db2d150238",
-            "us-west-1" => "ami-00c3b2d35bddd4f5c"}
+    AMIS = {"us-west-2" => "ami-07af9511082779ae7",
+            "us-east-1" => "ami-027792c3cc6de7b5b",
+            "us-east-2" => "ami-036130f4127a367f7",
+            "us-west-1" => "ami-03612357ac9da2c7d"}
 
-    GPU_AMIS = {"us-west-2" => "ami-08156e8fd65879a13",
-                "us-east-1" => "ami-0c974dde3f6d691a1",
-                "us-east-2" => "ami-089849e811ace242f",
-                "us-west-1" => "ami-0c3479bcd739094f0"}
+    GPU_AMIS = {"us-west-2" => "ami-08754f7ac73185331",
+                "us-east-1" => "ami-03c499c67bc65c089",
+                "us-east-2" => "ami-081210a2fd7f3c487",
+                "us-west-1" => "ami-047637529a86c7237"}
 
     EKS_IAM_POLICIES = %w{AmazonEKSWorkerNodePolicy
                           AmazonEKS_CNI_Policy

data/lib/eks_cli/version.rb

@@ -1,3 +1,3 @@
 module EksCli
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eks_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Erez Rabih
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement