eks_cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3f3482b85b1f958736fc15f42ca78a0758bb260f41fc2b9a82b8ac4d41290d
-  data.tar.gz: f8716d74941af68b46f7b969af80d5d0747f140f4eaf09d0ca5d32d32c66f4d7
+  metadata.gz: 4f9a211d597363f1bed8d7d5da00a16a235fa64bbce4b406597999f4d1646f39
+  data.tar.gz: 52066dc17593bb64e4f57f6e2888385a96148cc3ba089928655bd81a57dd460f
 SHA512:
-  metadata.gz: 7632811983ed89098c1be2f08cc92f612641863ce0aa90d0b6c19dfbdf3d6de75a9e06a1133f673db9f0a90205511b930de790db47a099b253b24f4c043b8bce
-  data.tar.gz: d4592a8ee34300d7b87b63aa32146bd5fcfbd150760ee36ea4a8a3e86332566aa6b2a93173cdbb6199cd7ab798d5739f8c8f1e1fc5e06c4c41dea147d2e3d61e
+  metadata.gz: 92894a3cc1f53d3bc641bc493a1c1050202ed613b636fc91bbc14901da6646e42c3c93114e18df7fd8c3d14c3a3ce61dedb3aef2294c6494b2881687f6e41c0d
+  data.tar.gz: a8f1ea587bc68568347fae185878f4727677aeed81a8dc0da72cbe050bd4e55df8cf91a49085a8e9fe911a148562216af5d0c801a5140a32b5479e6572aeda89

data/lib/eks_cli/cli.rb

@@ -65,9 +65,9 @@ module EksCli
     option :group_name, desc: "group name to show configuration for"
     def show_config
       if options[:group_name]
-        puts JSON.pretty_generate(Config[cluster_name].for_group(options[:group_name]))
+        puts JSON.pretty_generate(config.for_group(options[:group_name]))
       else
-        puts JSON.pretty_generate(Config[cluster_name].read_from_disk)
+        puts JSON.pretty_generate(config.read_from_disk)
       end
     end
 
@@ -95,7 +95,7 @@ module EksCli
     option :all, type: :boolean, default: false, desc: "create all nodegroups. must be used in conjunction with --yes"
     option :group_name, type: :string, default: "Workers", desc: "create a specific nodegroup. can't be used with --all"
     option :ami, desc: "AMI for the nodegroup"
-    option :instance_type, default: "m5.xlarge", desc: "EC2 instance type (m5.xlarge etc...)"
+    option :instance_type, default: "m4.xlarge", desc: "EC2 instance type (m5.xlarge etc...)"
     option :subnets, type: :array, default: ["1", "2", "3"], desc: "subnets to run on. for example --subnets=1 3 will run the nodegroup on subnet1 and subnet 3"
     option :ssh_key_name, desc: "name of the default SSH key for the nodes"
     option :taints, desc: "Kubernetes taints to put on the nodes for example \"dedicated=critical:NoSchedule\""
@@ -117,12 +117,20 @@ module EksCli
     end
 
     desc "scale-nodegroup", "scales a nodegroup"
-    option :group_name, type: :string, required: true, desc: "nodegroup name to scale"
-    option :min, required: true, type: :numeric, desc: "Minimum number of nodes on the nodegroup"
-    option :max, required: true, type: :numeric, desc: "Maximum number of nodes on the nodegroup"
+    option :all, type: :boolean, default: false, desc: "scale all nodegroups"
+    option :group_name, type: :string, required: false, desc: "nodegroup name to scale"
+    option :min, required: false, type: :numeric, desc: "minimum number of nodes on the nodegroup. defaults to nodegroup configuration."
+    option :max, required: false, type: :numeric, desc: "maximum number of nodes on the nodegroup. default to nodegroup configuration"
+    option :spotinst, type: :boolean, default: false, desc: "scale spotinst elastigroup if such exists"
+    option :asg, type: :boolean, default: true, desc: "scale ec2 auto scaling group"
+    option :update, type: :boolean, default: false, desc: "update the nodegroup attributes"
     def scale_nodegroup
-      NodeGroup.new(cluster_name, options[:group_name]).scale(options[:min].to_i, options[:max].to_i)
-      Config[cluster_name].update_nodegroup(options)
+      nodegroups.each do |ng| 
+        min = (options[:min] || config.for_group(ng.name)["min"]).to_i
+        max = (options[:max] || config.for_group(ng.name)["max"]).to_i
+        ng.scale(min, max, options[:asg], options[:spotinst])
+        Config[cluster_name].update_nodegroup(options.slice("min", "max").merge({"group_name" => ng.name})) if options[:update]
+      end
     end
 
     desc "delete-nodegroup", "deletes cloudformation stack for nodegroup"

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

@@ -57,6 +57,8 @@ module EksCli
       stack
     end
 
+    def name; @name; end
+
     def tags
       [{key: "eks-nodegroup", value: @group["group_name"]},
        {key: "eks-cluster", value: @cluster_name}]
@@ -64,6 +66,9 @@ module EksCli
 
     def delete
       cf_stack.delete
+      if @group["spotinst"]
+        spotinst.delete_elastigroup(@group["spotinst"]["id"])
+      end
     end
 
     def asg
@@ -77,7 +82,14 @@ module EksCli
     def export_to_spotinst(exact_instance_type)
       Log.info "exporting nodegroup #{@name} to spotinst"
       instance_types = exact_instance_type ? [instance_type] : nil
-      Log.info Spotinst::Client.new.import_asg(config["region"], asg, instance_types)
+      response = spotinst.import_asg(config["region"], asg, instance_types)
+      if response.code == 200
+        Log.info "Successfully created elastigroup"
+        elastigroup = response.parsed_response["response"]["items"].first
+        config.update_nodegroup({"group_name" => @name, "spotinst" => elastigroup})
+      else
+        Log.warn "Error creating elastigroup:\n #{response}"
+      end
     end
 
     def cf_stack
@@ -87,16 +99,30 @@ module EksCli
       raise e
     end
 
-    def scale(min, max)
-      Log.info "scaling #{asg}: min -> #{min}, max -> #{max}"
+    def scale(min, max, asg = true, spotinst = false)
+      scale_asg(min, max) if asg
+      scale_spotinst(min, max) if spotinst
+    end
+
+    private
+
+    def scale_spotinst(min, max)
+      if eid = @group.dig("spotinst", "id")
+        spotinst.scale(eid, min, max)
+      else
+        Log.warn "could not find spotinst elastigroup for nodegroup #{@name}"
+      end
+    end
+
+    def scale_asg(min, max)
+      Log.info "scaling ASG #{asg}: min -> #{min}, max -> #{max}"
       Log.info asg_client.update_auto_scaling_group({
         auto_scaling_group_name: asg, 
         max_size: max, 
         min_size: min
       })
-    end
 
-    private
+    end
 
     def cf_template_body
       @cf_template_body ||= File.read(File.join($root_dir, '/assets/cf/nodegroup.yaml'))
@@ -185,6 +211,10 @@ module EksCli
       @asg_client ||= Aws::AutoScaling::Client.new(region: config["region"])
     end
 
+    def spotinst
+      @spotinst ||= Spotinst::Client.new
+    end
+
   end
 
 end

data/lib/eks_cli/spotinst/client.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'log'
 module EksCli
   module Spotinst
     class Client 
@@ -29,6 +30,16 @@ module EksCli
       def list_groups
         self.class.get("/aws/ec2/group?accountId=#{@account_id}")
       end
+
+      def scale(group_id, min, max)
+        Log.info "scaling elastigroup #{group_id} {#{min}, #{max}}"
+        Log.info self.class.put("/aws/ec2/group/#{group_id}/capacity?accountId=#{@account_id}", body: {capacity: {minimum: min, maximum: max, target: max}}.to_json)
+      end
+
+      def delete_elastigroup(group_id)
+        Log.info "deleting elastigroup #{group_id}"
+        Log.info self.class.delete("/aws/ec2/group/#{group_id}?accountId=#{@account_id}")
+      end
     end
   end
 end

data/lib/eks_cli/version.rb

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

metadata

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