eks_cli 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f9a211d597363f1bed8d7d5da00a16a235fa64bbce4b406597999f4d1646f39
-  data.tar.gz: 52066dc17593bb64e4f57f6e2888385a96148cc3ba089928655bd81a57dd460f
+  metadata.gz: 7c2b086d65764f440991cea882ecc9a24737993481bccfd5668492a014c21040
+  data.tar.gz: c254941ebd5f50a57b003539bf9abf4495838afe91546c3144d8abfadbcb56f0
 SHA512:
-  metadata.gz: 92894a3cc1f53d3bc641bc493a1c1050202ed613b636fc91bbc14901da6646e42c3c93114e18df7fd8c3d14c3a3ce61dedb3aef2294c6494b2881687f6e41c0d
-  data.tar.gz: a8f1ea587bc68568347fae185878f4727677aeed81a8dc0da72cbe050bd4e55df8cf91a49085a8e9fe911a148562216af5d0c801a5140a32b5479e6572aeda89
+  metadata.gz: 3b4418d049386d958e076c0a455b5e07e23c99dc08c1fd5129c6febc2d4028386885c496d27a7c8bdf728ab813be531dfa79979fe94c2d803029c8b8c9447516
+  data.tar.gz: 323b3b1e093617b49ecde03a5f99c18dc9c39eff7ab164c32450085f1ca8660d434249cd3ea601ba7f5d3bb5b4d3ae7cded6888057dfcb8b8992eb4f2228741a

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

@@ -7,6 +7,10 @@ Parameters:
   ClusterName:
     Type: String
     Description: EKS cluster name
+  
+  KubernetesVersion:
+    Type: String
+    Description: Kubernetes version - 1.10, 1.11, etc...
 
   VpcBlock:
     Type: String
@@ -192,7 +196,7 @@ Resources:
           - !Ref Subnet02
           - !Ref Subnet03
       RoleArn: !GetAtt AWSServiceRoleForAmazonEKS.Arn
-      Version: "1.12"
+      Version: !Ref KubernetesVersion
 
   NodeGroupsInClusterSecurityGroup:
     Type: AWS::EC2::SecurityGroup

data/lib/eks_cli/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'version'
+require 'log'
 
 autoload :JSON, 'json'
 
@@ -51,14 +52,13 @@ module EksCli
               subnet3_az: (options[:subnet3_az] || Config::AZS[options[:region]][2])}
       config.bootstrap(opts)
       cluster = EKS::Cluster.new(cluster_name).create
-      config.write(cluster.config)
       cluster.update_kubeconfig
       wait_for_cluster
       enable_gpu if options[:enable_gpu]
       create_default_storage_class if options[:create_default_storage_class]
       create_dns_autoscaler if options[:create_dns_autoscaler]
       update_cluster_cni if options[:warm_ip_target]
-      say "cluster creation completed"
+      Log.info "cluster creation completed"
     end
 
     desc "show-config", "print cluster configuration"
@@ -133,6 +133,11 @@ module EksCli
       end
     end
 
+    desc "delete-cluster", "deleted cluster"
+    def delete_cluster
+      EKS::Cluster.new(cluster_name).delete
+    end
+
     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 :group_name, type: :string, desc: "delete a specific nodegroup. can't be used with --all"

data/lib/eks_cli/cloudformation/eks.rb

@@ -17,7 +17,7 @@ module EksCli
         s = Stack.create(@cluster_name, cf_config)
         Stack.await([s])
         s.reload
-        puts "Outputs are:
+        Log.info "Outputs are:
           SecurityGroups: #{s.output("SecurityGroups")}
           VpcId: #{s.output("VpcId")}
           SubnetIds: #{s.output("SubnetIds")}
@@ -31,6 +31,10 @@ module EksCli
          cluster_arn: s.output("EKSClusterARN")}
       end
 
+      def delete
+        Stack.new(@cluster_name, stack_name).delete
+      end
+
       private
 
       def cf_config
@@ -66,7 +70,8 @@ module EksCli
          "Subnet01AZ" => config["subnet1_az"],
          "Subnet02AZ" => config["subnet2_az"],
          "Subnet03AZ" => config["subnet3_az"],
-         "ClusterName" => @cluster_name}.map do |(k,v)|
+         "ClusterName" => @cluster_name,
+         "KubernetesVersion" => config["kubernetes_version"]}.map do |(k,v)|
           {parameter_key: k, parameter_value: v}
         end
 

data/lib/eks_cli/cloudformation/stack.rb

@@ -34,7 +34,7 @@ module EksCli
       end
 
       def delete
-        Log.info "deleting stack #{id} from cloudformation"
+        Log.info "deleting cloufdormation stack #{id}"
         client.delete_stack(stack_name: id)
       end
 

data/lib/eks_cli/eks/cluster.rb

@@ -1,5 +1,7 @@
 require 'cloudformation/eks'
+require 'vpc/client'
 require 'config'
+require 'nodegroup'
 require 'log'
 
 module EksCli
@@ -12,15 +14,56 @@ module EksCli
 
       def create
         Log.info "creating cluster #{@cluster_name}"
-        @config = CloudFormation::EKS.new(@cluster_name).create
+        cf_stack_outputs = CloudFormation::EKS.new(@cluster_name).create
+        config.write(cf_stack_outputs)
         self
       end
 
-      def config; @config; end
+      def delete
+        delete_vpc_peering
+        delete_services
+        delete_nodegroups
+        delete_cf_stack
+      end
+
+      def config; Config[@cluster_name]; end
 
       def update_kubeconfig
         Log.info "updating kubeconfig for cluster #{@cluster_name}"
-        Log.info `aws eks update-kubeconfig --name=#{@cluster_name} --region=#{Config[@cluster_name]["region"]}`
+        Log.info `aws eks update-kubeconfig --name=#{@cluster_name} --region=#{config["region"]}`
+      end
+
+      private
+
+      def delete_cf_stack
+        CloudFormation::EKS.new(@cluster_name).delete
+      end
+
+      def delete_vpc_peering
+        VPC::Client.new(@cluster_name).delete_vpc_peering_connection
+      end
+
+      def k8s_client
+        @k8s_client ||= EksCli::K8s::Client.new(@cluster_name)
+      end
+
+      def services
+        k8s_client.get_services(namespace: "default").select {|s| s[:spec][:type] == "LoadBalancer"}
+      end
+
+      def delete_services
+        services.map {|s| s[:metadata][:name]}.each do |s|
+          Log.info "deleting service #{s}"
+          k8s_client.delete_service(s, "default")
+        end
+      end
+
+      def nodegroups
+        config["groups"] || {}
+      end
+
+      def delete_nodegroups
+        nodegroups.keys.each {|n| NodeGroup.new(@cluster_name, n).delete}
       end
 
     end

data/lib/eks_cli/nodegroup.rb

@@ -25,15 +25,21 @@ module EksCli
          iam_policies: "NodeGroupIAMPolicies",
          bootstrap_args: "BootstrapArguments"}
 
-    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-0bebf2322fd52a42e",
-                "us-east-1" => "ami-0cb7959f92429410a",
-                "us-east-2" => "ami-0118b61dc2312dee2",
-                "us-west-1" => "ami-047637529a86c7237"}
+    AMIS = {"1.12" => {"us-west-2" => "ami-0923e4b35a30a5f53",
+                       "us-east-1" => "ami-0abcb9f9190e867ab",
+                       "us-east-2" => "ami-04ea7cb66af82ae4a",
+                       "us-west-1" => "ami-03612357ac9da2c7d"},
+            "1.13" => {"us-west-2" => "ami-089d3b6350c1769a6",
+                       "us-east-1" => "ami-08c4955bcc43b124e",
+                       "us-east-2" => "ami-07ebcae043cf995aa"}}
+
+    GPU_AMIS = {"1.12" => {"us-west-2" => "ami-0bebf2322fd52a42e",
+                           "us-east-1" => "ami-0cb7959f92429410a",
+                           "us-east-2" => "ami-0118b61dc2312dee2",
+                           "us-west-1" => "ami-047637529a86c7237"},
+                "1.13" => {"us-west-2" => "ami-08e5329e1dbf22c6a",
+                           "us-east-1" => "ami-02af865c0f3b337f2",
+                           "us-east-2" => "ami-01f82bb66c17faf20"}}
 
     EKS_IAM_POLICIES = %w{AmazonEKSWorkerNodePolicy
                           AmazonEKS_CNI_Policy
@@ -65,6 +71,7 @@ module EksCli
     end
 
     def delete
+      Log.info "deleting nodegroup #{@name}"
       cf_stack.delete
       if @group["spotinst"]
         spotinst.delete_elastigroup(@group["spotinst"]["id"])
@@ -193,9 +200,9 @@ module EksCli
 
     def default_ami
       if gpu?
-        GPU_AMIS[config["region"]]
+        GPU_AMIS[config["kubernetes_version"]][config["region"]]
       else
-        AMIS[config["region"]]
+        AMIS[config["kubernetes_version"]][config["region"]]
       end
     end
 

data/lib/eks_cli/version.rb

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

data/lib/eks_cli/vpc/client.rb

@@ -13,6 +13,7 @@ module EksCli
         @old_vpc = vpc_by_id(old_vpc_id)
         Log.info "setting vpc networking between #{new_vpc.id} and #{old_vpc.id}"
         peering_connection_id = create_vpc_peering_connection
+        config.write(vpc_peering_connection_id: peering_connection_id)
         update_route_tables(peering_connection_id)
         allow_networking(old_vpc_sg_id, peering_connection_id)
       end
@@ -35,6 +36,15 @@ module EksCli
         return peering_connection_id
       end
 
+      def delete_vpc_peering_connection
+        if id = config["vpc_peering_connection_id"]
+          Log.info "deleting vpc peering connection #{id}"
+          Log.info client.delete_vpc_peering_connection(vpc_peering_connection_id: id)
+        else
+          Log.info "no vpc peering connection found"
+        end
+      end
+
       def update_route_tables(peering_connection_id)
         Log.info "updating route tables"
         point_from(old_vpc, new_vpc, peering_connection_id)

metadata

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