eks_cli 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3e72f358690e91b457a14a2965971c5c7f8096
-  data.tar.gz: a1188295b0461d98b40a370985c8801b206fdf79
+  metadata.gz: 8018b870965acb14650d78b33c8d7ff7ac3fd146
+  data.tar.gz: b4253ff9454d66f1ef2fa65fba9ccc5dead775ba
 SHA512:
-  metadata.gz: adadae25deffad969e6e357f76372a41e1646f337308483fb10fbb7dcf700084341cf4d77f391dceebeed43f433eed9669e3495764adc16a3e50f5a8a2810e8a
-  data.tar.gz: 77e388b3a33309427255d85b9663e72144f3f8aeeab91a53b0e521acaa0a9dfde016494ccad7becbc1fb1996355f172793dacb91b05678e93b157d79f60d3379
+  metadata.gz: 00673c6ad254fb33cd2573f5558123c58682ad601cd431a7b7a244cbd98ce94c1a13574cf8f6bf17e9faff94d90c48a74c75f74f4a203eb3d223083f058b7755
+  data.tar.gz: ddec8dbd285e41a34cf2cef2a5f7fbc36ebefdd2ffac327e5eb2d309ae3f74a69ab33dce3c14a306ea4b0c244aa6a60f1965c8497e3f21761037c9a8ad58f512

data/README.md

@@ -11,23 +11,25 @@ EKS cluster bootstrap with batteries included
 * Easily configure docker repository secrets to allow pulling private images
 * Manage Route53 DNS records to point at your Kubernetes services
 * Export nodegroups to SporInst Elastigroups
+* Auto resolving AMIs by region & instance types (GPU enabled AMIs)
 * Even more...
 
 ## Usage
 
 ```
-$ gem install eks_cli -v 0.1.7
+$ gem install eks_cli -v 0.1.8
 $ eks create us-west-2 --cluster-name My-EKS-Cluster
-$ eks create-nodegroup --cluster-name My-EKS-Cluster --group-name nodes --ssh-key-name my-ssh-key --yes
+$ eks create-nodegroup --cluster-name My-EKS-Cluster --group-name nodes --ssh-key-name <my-ssh-key> --yes
 ```
 
 You can type `eks` in your shell to get the full synopsis of available commands
 
-## Prerequisite
+## Prerequisites
 
 1. Ruby
-2. `kubectl` with version > 10 on your `PATH`
-3. `aws-iam-authenticator` on your `PATH`
+2. [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version >= 10 on your `PATH`
+3. [aws-iam-authenticator](https://github.com/kubernetes-sigs/aws-iam-authenticator) on your `PATH`
+4. [aws-cli](https://docs.aws.amazon.com/cli/latest/userguide/installing.html) version >= 1.16.18 on your `PATH`
 
 ## Extra Stuff
 
@@ -94,7 +96,7 @@ Assuming you have some shared resources on another VPC (an RDS instance for exam
 
 1. Creating and accepting a VPC peering connection from your EKS cluster VPC to the old VPC
 2. Setting route tables on both directions to allow communication
-3. Adding an ingress role to SG_ID to accept all communication from your new cluster nodes.
+3. Adding an ingress rule to SG_ID to accept all communication from your new cluster nodes.
 
 ### Exporting nodegroups to Spotinst
 

data/lib/eks_cli/cloudformation/stack.rb

@@ -45,7 +45,11 @@ module EksCli
       end
 
       def eks_worker?
-        !worker_tag.empty?
+        worker_tag
+      end
+
+      def eks_cluster
+        get_tag("eks-cluster")
       end
 
       def node_instance_role_arn
@@ -103,12 +107,13 @@ module EksCli
         client.describe_stacks(stack_name: @id).stacks.first
       end
 
-      def worker_tag
-        stack.tags.select {|t| worker_tag?(t)}
+      def get_tag(k)
+        tag = stack.tags.select {|t| t.key == k}.first
+        tag.value if tag
       end
 
-      def worker_tag?(tag)
-        tag.key == "eks-nodegroup"
+      def worker_tag
+        get_tag("eks-nodegroup")
       end
 
     end

data/lib/eks_cli/config.rb

@@ -111,7 +111,6 @@ module EksCli
 
     def group_defaults
       {"group_name" => "Workers",
-       "ami" => "ami-0a54c984b9f908c81",
        "instance_type" => "m5.xlarge",
        "max" => 1,
        "min" =>  1,

data/lib/eks_cli/k8s/auth.rb

@@ -4,6 +4,7 @@ require 'config'
 require 'cloudformation/client'
 require 'cloudformation/stack'
 require 'log'
+require 'nodegroup'
 
 module EksCli
   module K8s
@@ -36,17 +37,20 @@ module EksCli
       end
 
       def node_arns
-        client
-          .list_stacks(stack_status_filter: ["CREATE_COMPLETE"])
-          .stack_summaries
-          .map(&:stack_id)
-          .map {|id| CloudFormation::Stack.new(@cluster_name, id)}
+        config["groups"]
+          .keys
+          .map {|name| NodeGroup.new(@cluster_name, name).cf_stack}
           .select {|stack| stack.eks_worker?}
+          .select {|stack| stack.eks_cluster == @cluster_name}
           .map {|stack| stack.node_instance_role_arn}
       end
 
       def users
-        Config[@cluster_name]["users"]
+        config["users"]
+      end
+
+      def config
+        Config[@cluster_name]
       end
 
       def configmap

data/lib/eks_cli/nodegroup.rb

@@ -23,6 +23,16 @@ module EksCli
          group_name: "NodeGroupName",
          bootstrap_args: "BootstrapArguments"}
 
+    AMIS = {"us-west-2" => "ami-0a54c984b9f908c81",
+            "us-east-1" => "ami-0440e4f6b9713faf6",
+            "us-east-2" => "ami-0958a76db2d150238",
+            "us-west-1" => "ami-00c3b2d35bddd4f5c"}
+
+    GPU_AMIS = {"us-west-2" => "ami-08156e8fd65879a13",
+                "us-east-1" => "ami-0c974dde3f6d691a1",
+                "us-east-2" => "ami-089849e811ace242f",
+                "us-west-1" => "ami-0c3479bcd739094f0"}
+
     CAPABILITIES = ["CAPABILITY_IAM"]
 
     def initialize(cluster_name, name)
@@ -65,7 +75,14 @@ module EksCli
 
     def export_to_spotinst
       Log.info "exporting nodegroup #{@name} to spotinst"
-      Log.info Spotinst::Client.new.import_asg(Config[@cluster_name]["region"], asg, [instance_type])
+      Log.info Spotinst::Client.new.import_asg(config["region"], asg, [instance_type])
+    end
+
+    def cf_stack
+      CloudFormation::Stack.find(@cluster_name, stack_name)
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      Log.error("could not find stack for nodegroup #{@name} - please make sure to run eks create-nodegroup --all --yes -c <cluster_name> to sync config")
+      raise e
     end
 
     private
@@ -74,10 +91,6 @@ module EksCli
       @cf_template_body ||= File.read(File.join($root_dir, '/assets/nodegroup_cf_template.yaml'))
     end
 
-    def cf_stack
-      CloudFormation::Stack.find(@cluster_name, stack_name)
-    end
-
     def await(stack)
 
       while stack.pending? do
@@ -105,6 +118,7 @@ module EksCli
 
     def build_params
       @group["bootstrap_args"] = bootstrap_args
+      @group["ami"] ||= default_ami
       @group.except("taints").inject([]) do |params, (k, v)|
         params << build_param(k, v)
       end
@@ -128,6 +142,22 @@ module EksCli
        parameter_value: v.to_s}
     end
 
+    def default_ami
+      if gpu?
+        GPU_AMIS[config["region"]]
+      else
+        AMIS[config["region"]]
+      end
+    end
+
+    def gpu?
+      @group["instance_type"].start_with?("p2.") || @group["instance_type"].start_with?("p3.")
+    end
+
+    def config
+      Config[@cluster_name]
+    end
+
   end
 
 end

data/lib/eks_cli/version.rb

@@ -1,3 +1,3 @@
 module EksCli
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eks_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Erez Rabih