eks_cli 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62ee30623f0fd61827904b8f98c59a67b58fc40
-  data.tar.gz: 6eaa89a740fb4924ef581d31c30b0713b5aa1b52
+  metadata.gz: 1e852fd7cab1e027499c5b73c8dbcbba706cda3b
+  data.tar.gz: 3f4f32cf77a09ec17671f98d339535416dbe8e51
 SHA512:
-  metadata.gz: 9a8de458722606f0b45d0c8fdef430a197d4e7a3ea328d7150b6adf02d06cc1e2e6bd4937393f3496d5910ac2527f026511560b34de4eb69b057370e4ccc086a
-  data.tar.gz: 4ffd3da0724d1a01260df41f363692f8b082aa807d9348a3ae8e5cf65544a6bcb04ca02c9fa48127a26bc986b30c463362d4bf266443e2fcbc353be9baa9b6d9
+  metadata.gz: 15532629de7a263da29b1ddf239470597cc51d87c66d8dcfc7630fc23a4a2eb9643ac3df8f27f15f9681d2c8f5e3340ae4f4632f38f58214784e2eef4f341bab
+  data.tar.gz: e9a5666560c2c1d9c21f2e7ecd92f57cf2b792d5efa4cd28e6760b7eedfa262a0e4ad7a963562351ea0e9c77534c1647b6b4e75e294420bc4359298f91022737

data/README.md

@@ -17,8 +17,8 @@ EKS cluster bootstrap with batteries included
 ## Usage
 
 ```
-$ gem install eks_cli -v 0.1.9
-$ eks create us-west-2 --cluster-name My-EKS-Cluster
+$ gem install eks_cli -v 0.2.1
+$ eks create --cluster-name My-EKS-Cluster
 $ eks create-nodegroup --cluster-name My-EKS-Cluster --group-name nodes --ssh-key-name <my-ssh-key> --yes
 ```
 

data/eks_cli.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '5.2.1.1'
   s.add_dependency 'kubeclient', '4.1.0'
   s.add_dependency 'httparty', '0.16.3'
+  s.add_dependency 'ipaddress', '0.8.3'
 end
 

data/lib/eks_cli/cli.rb

@@ -35,13 +35,15 @@ module EksCli
 
     class_option :cluster_name, required: true, aliases: :c
 
-    desc "create REGION", "creates a new EKS cluster"
+    desc "create", "creates a new EKS cluster"
+    option :cidr, type: :string, default: "192.168.0.0/16", desc: "CIRD block for cluster VPC"
+    option :region, type: :string, default: "us-west-2", desc: "AWS region for EKS cluster"
     option :open_ports, type: :array, default: [], desc: "open ports on cluster nodes (eg 22 for SSH access)"
     option :enable_gpu, type: :boolean, default: false, desc: "installs nvidia device plugin daemon set"
     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(region)
-      Config[cluster_name].bootstrap({region: region})
+    def create
+      Config[cluster_name].bootstrap({region: options[:region]})
       create_eks_role
       create_cluster_vpc
       create_eks_cluster
@@ -70,8 +72,10 @@ module EksCli
     end
 
     desc "create-cluster-vpc", "creates a vpc according to aws cloudformation template"
+    option :cidr, type: :string, default: "192.168.0.0/16", desc: "CIRD block for cluster VPC"
     def create_cluster_vpc
-      cfg = CloudFormation::VPC.create(cluster_name)
+      Config[cluster_name].write({cidr: options[:cidr]}, :config)
+      cfg = CloudFormation::VPC.new(cluster_name).create
       Config[cluster_name].write(cfg)
     end
 

data/lib/eks_cli/cloudformation/vpc.rb

@@ -1,13 +1,21 @@
 require 'cloudformation/stack'
+require 'config'
+require 'ipaddress'
 require 'log'
 
 module EksCli
   module CloudFormation
     class VPC
 
-      def self.create(cluster_name)
-        Log.info "creating VPC stack for #{cluster_name}"
-        s = Stack.create(cluster_name, config(cluster_name))
+      CF_TEMPLATE_URL = "https://amazon-eks.s3-us-west-2.amazonaws.com/cloudformation/2018-08-30/amazon-eks-vpc-sample.yaml" 
+
+      def initialize(cluster_name)
+        @cluster_name = cluster_name
+      end
+
+      def create
+        Log.info "creating VPC stack for #{@cluster_name}"
+        s = Stack.create(@cluster_name, cf_config)
         Stack.await([s])
         s.reload
         puts "Outputs are:
@@ -22,10 +30,39 @@ module EksCli
 
       private
 
-      def self.config(cluster_name)
-        {stack_name: "EKS-VPC-#{cluster_name}",
-         template_url: "https://amazon-eks.s3-us-west-2.amazonaws.com/cloudformation/2018-08-30/amazon-eks-vpc-sample.yaml",
-         tags: [{key: "eks-cluster", value: cluster_name.to_s}]}
+      def cf_config
+        {stack_name: stack_name,
+         template_url: CF_TEMPLATE_URL,
+         parameters: build_params,
+         tags: tags}
+      end
+
+      def stack_name
+        "#{@cluster_name}-EKS-VPC"
+      end
+
+      def tags
+        [{key: "eks-cluster", value: @cluster_name.to_s}]
+      end
+
+      def build_params
+        subnets = IPAddress::IPv4.new(cidr).split(3).map(&:to_string)
+
+        {"VpcBlock" => cidr,
+         "Subnet01Block" => subnets[0],
+         "Subnet02Block" => subnets[1],
+         "Subnet03Block" => subnets[2]}.map do |(k,v)|
+          {parameter_key: k, parameter_value: v}
+        end
+
+      end
+
+      def cidr
+        @cidr ||= config["cidr"]
+      end
+
+      def config
+        @config ||= Config[@cluster_name]
       end
 
     end

data/lib/eks_cli/nodegroup.rb

@@ -113,7 +113,7 @@ module EksCli
     end
 
     def stack_name
-      "#{@group["cluster_name"]}-Workers-#{@group["group_name"]}"
+      "#{@group["cluster_name"]}-NodeGroup-#{@group["group_name"]}"
     end
 
     def build_params

data/lib/eks_cli/version.rb

@@ -1,3 +1,3 @@
 module EksCli
-  VERSION = "0.1.9"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eks_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
 platform: ruby
 authors:
 - Erez Rabih
@@ -136,6 +136,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.16.3
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 description: A utility to manage and create EKS (Kubernetes) cluster on Amazon Web
   Services
 email: erez.rabih@gmail.com