eks_cli 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13604399317ad223e406ab42975a58de062eba61d6f5f2f073c545818c89b625
-  data.tar.gz: 237117a49388e1d2dde8044a8935e5a2dd56ae9c92769930919df1d1750fa01f
+  metadata.gz: e102cb3931260341e379116c618a7ea87a9965923ea1799c054081362fe3d69a
+  data.tar.gz: 7bc35061ea5dd401e599c5deb1ecedf57c6de8b36898a79d0ab74127ab5e2d45
 SHA512:
-  metadata.gz: 25568fb30b957afd895a46666fc1e7b6f6a83c119b5294031f7505a933d81c4fbf112a805de02ca0d66c490c483b585f7253316da942cba22b37c8d8c7c18253
-  data.tar.gz: d982788e52ef2485652940c5506a6ba654d77f33bbcd331a3149cb37858f0a7c58493a0582590768b60a85cb2e1a0d50760e49371e65c77b2223d882b622db50
+  metadata.gz: 8412cb6ff62d5ee0d4c8183494f28b187b40b2bc9b0e1b3e014323cb75c80493444231e0762c3806bb48a95df09d478b7d89a8cd61d2ebf8f4df88996af01dc6
+  data.tar.gz: 1d75c45b84715d072ac32b5973d45f622df4af130a6ab97e0557216b720502a10750dfe956469cf8bda9bae12cd564c8d0d2cfbd60ecaae77ee49da3ef44f5f8

data/README.md

@@ -63,13 +63,15 @@ Options:
 
 ## Environment variables
 
-You are encouraged to use both `EKS_CLI_CLUSTER_NAME` and `EKS_CLI_S3_BUCKET` environment variables instead of using the corresponding flags on each command. It makes the command clearer and reduces the chance for typos.
+You are encouraged to export both `EKS_CLI_CLUSTER_NAME` and `EKS_CLI_S3_BUCKET` environment variables instead of using the corresponding flags on each command. It makes the command clearer and reduces the chance for typos.
 The following selected commands assumes you have exported both environment variables:
 ```bash
 export EKS_CLI_S3_BUCKET=my-eks-config-bucket
 export EKS_CLI_CLUSTER_NAME=my-eks-cluster
 ```
 
+`EKS_CLI_S3_BUCKET` can be safely put in your `~/.bash_profile` and `EKS_CLI_CLUSTER_NAME` may be exported on a cluster basis
+
 ## Selected Commands
 
 ### Creating more than a single nodegroup

data/eks_cli.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = ["eks"]
   s.require_paths = ["lib"]
   s.add_dependency 'aws-sdk-s3', '~> 1'
+  s.add_dependency 'aws-sdk-elasticloadbalancing', '~> 1'
   s.add_dependency 'thor', '0.20.3'
   s.add_dependency 'aws-sdk-ec2', '1.62.0'
   s.add_dependency 'aws-sdk-cloudformation', '1.13.0'

data/lib/eks_cli/cli.rb

@@ -144,7 +144,7 @@ module EksCli
       end
     end
 
-    desc "delete-cluster", "deletes a cluster, including nodegroups/elastigroups and cloudformation stacks"
+    desc "delete-cluster", "deletes a cluster, including nodegroups/elastigroups, elbs, kubernetes services and cloudformation stacks"
     def delete_cluster
       with_context { EKS::Cluster.new(cluster_name).delete }
     end

data/lib/eks_cli/eks/cluster.rb

@@ -1,5 +1,6 @@
 require 'cloudformation/eks'
 require 'vpc/client'
+require 'aws-sdk-elasticloadbalancing'
 require 'config'
 require 'nodegroup'
 require 'log'
@@ -34,6 +35,10 @@ module EksCli
         Log.info `aws eks update-kubeconfig --name=#{@cluster_name} --region=#{config["region"]}`
       end
 
+      def services
+        k8s_client.get_services(namespace: "default").select {|s| s[:spec][:type] == "LoadBalancer"}
+      end
+
       private
 
       def delete_config
@@ -52,14 +57,14 @@ module EksCli
         @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")
+        services.each do |s|
+          name = s[:metadata][:name]
+          elb = s[:status][:loadBalancer][:ingress].first[:hostname].split("-").first
+          Log.info "deleting ELB #{elb}"
+          elb_client.delete_load_balancer(load_balancer_name: elb)
+          Log.info "deleting service #{name}"
+          k8s_client.delete_service(name, "default")
         end
       end
 
@@ -71,6 +76,10 @@ module EksCli
         nodegroups.keys.each {|n| NodeGroup.new(@cluster_name, n).delete}
       end
 
+      def elb_client
+        @elb_client ||= Aws::ElasticLoadBalancing::Client.new(region: config["region"])
+      end
+
     end
   end
 end

data/lib/eks_cli/version.rb

@@ -1,3 +1,3 @@
 module EksCli
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eks_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Erez Rabih
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-elasticloadbalancing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement