sct 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0c29ef1fa29ea92d1ecd0e5190b72a10a6b8253c93e3cdea79c6cf02093bc8
-  data.tar.gz: 987dcdf7f07e610c7c1f5dadf0096dbd006bd4a8da601cdeb59919c5b8fb95ac
+  metadata.gz: 61cca19491733244389c6a46e8c8fd8fd226b3cdab4fb8537b17a4e6d51d196e
+  data.tar.gz: 3057200714457d8b312f34f542454019155e634137d8a0de5ffe4fee93538d90
 SHA512:
-  metadata.gz: 7cef3c668d1ff1bf1e92a0d1363582f6310af7f639c15983168cd5ee03e5885d05a4c409c518d90b53b74fedf3f1ac71945e201772dd131fc97ee3e652b062fe
-  data.tar.gz: 98ed6109ff77991041a559db372a2a74e45b6693725025e258c020f506df77c355505af0510050fb2269566b994e42e6a247a03ac08f4538e70833904fd6014d
+  metadata.gz: 721bcf403b7292dad0bec08f9d0198ad64acc9ab5ffa0200299499d51b7fb3b15fb859f5812c03347484fe5175263d73af86072f65138bb3cdda39e3ba532621
+  data.tar.gz: 19386f51a743615e480a579ce3fbb7eb17859a0f8bd2e57c21b9ce57562ac6c6436bcee1d6b845004317d160e2b2d288703a07c5829dfd02374b286cbe8a9a4c

data/cluster/lib/cluster/commands_generator.rb

@@ -9,7 +9,7 @@ module Cluster
             self.new.run
         end
 
-        def run 
+        def run
             program :name, 'cluster'
             program :version, Sct::VERSION
             program :description, 'CLI for \'cluster\' - Manage your local kubernetes cluster'
@@ -22,8 +22,8 @@ module Cluster
                 c.description = "Start the cluster"
                 c.option '--clean', 'start a clean cluster. Old cluster will be purged if available.'
 
-                c.action do |args, options| 
-                    if options.clean 
+                c.action do |args, options|
+                    if options.clean
                         Cluster::Runner.new.reset
                     else
                         Cluster::Runner.new.launch
@@ -37,17 +37,17 @@ module Cluster
                 c.syntax = 'sct cluster down'
                 c.description = 'stop the cluster'
 
-                c.action do |args, options| 
+                c.action do |args, options|
                     Cluster::Runner.new.down
                 end
             end
 
-            command :reset do |c| 
+            command :reset do |c|
 
                 c.syntax = 'sct cluster reset'
                 c.description = 'reset your cluster and start with a clean cluster'
 
-                c.action do |args, options| 
+                c.action do |args, options|
                     Cluster::Runner.new.reset
                 end
             end
@@ -59,13 +59,13 @@ module Cluster
                 c.syntax = 'sct cluster status'
                 c.description = 'see the status of your cluster'
 
-                c.action do |args, options| 
+                c.action do |args, options|
                     Cluster::Runner.new.status
                 end
             end
 
             command :'update config' do |c|
-                
+
                 c.syntax = 'sct cluster update config'
                 c.description = 'update the cluster configuration'
 
@@ -84,7 +84,7 @@ module Cluster
 
                     Cluster::Runner.new.delete_stalled_pods if options.stalled
                     Cluster::Runner.new.delete_all_pods if options.all
-                    
+
                     Cluster::Runner.new.delete_pods(args) if !args.empty?
 
                 end
@@ -106,4 +106,4 @@ module Cluster
             run!
         end
     end
-end
+end

data/cluster/lib/cluster/runner.rb

@@ -1,7 +1,7 @@
 module Cluster
     class Runner
-        
-        def launch 
+
+        def launch
             return UI.error("SCT has not been initialized. Run 'sct init' first.") unless SctCore::Config.exists
             start_cluster
             run_command "kubectl delete pod -n kube-system #{pods("kube-system").map { |pod| pod[:name] if pod[:name].start_with? "registry-creds" } .compact.join(" ")}"
@@ -33,10 +33,7 @@ module Cluster
             run_command "#{minikube} delete"
             start_cluster
             create_secrets
-            run_command "#{minikube} addons enable registry-creds"
-            run_command "#{minikube} addons enable ingress"
-            run_command "kubectl rollout status -n kube-system deployment/registry-creds"
-            run_command "kubectl rollout status -n kube-system deployment/nginx-ingress-controller"
+            enable_addons
             wait_for_gcr_secret
             run_command "kubectl apply -f ~/development/spend-cloud/k8s/ingress.yml"
             wait_for_ingress_ip
@@ -46,6 +43,19 @@ module Cluster
             post_start
         end
 
+        def enable_addons
+            enable_addon "registry-creds"
+            enable_addon "ingress"
+        end
+
+        def enable_addon(addon)
+            run_command "#{minikube} addons enable #{addon}"
+
+            deployment = deployments("kube-system").find { |deployment| deployment[:name].include? addon }
+
+            run_command "kubectl rollout status -n kube-system deployment/#{deployment[:name]}"
+        end
+
         def wait_for_pods
             UI.important("Waiting for pods to become ready...")
 
@@ -71,7 +81,7 @@ module Cluster
             end
         end
 
-        def delete_all_pods 
+        def delete_all_pods
             run_command "kubectl delete pods --all"
         end
 
@@ -105,12 +115,8 @@ module Cluster
             run_command "kubectl rollout status -n kube-system deployment/coredns"
         end
 
-        def pods(namespace = nil)
-            if namespace
-                output = `kubectl get pods -n #{namespace}`
-            else
-                output = `kubectl get pods`
-            end
+        def deployments(namespace = "default")
+            output = `kubectl get deployments -n #{namespace}`
 
             # split output lines
             lines = output.split "\n"
@@ -118,9 +124,26 @@ module Cluster
             #  exclude first line (table header)
             lines = lines[1..-1]
 
-            if lines.to_a.empty?
-                return 
+            # get name and status of each pod
+            lines.map do |line|
+                columns = line.split(" ")
+
+                name = columns[0]
+
+                {
+                    name: name
+                }
             end
+        end
+
+        def pods(namespace = "default")
+            output = `kubectl get pods -n #{namespace}`
+
+            # split output lines
+            lines = output.split "\n"
+
+            #  exclude first line (table header)
+            lines = lines[1..-1]
 
             # get name and status of each pod
             lines.map do |line|
@@ -216,12 +239,12 @@ module Cluster
           end
         end
 
-        def print_pods_status(namespace = nil)
+        def print_pods_status(namespace = "default")
 
           pods_list = pods(namespace)
 
           if pods_list.to_a.empty?
-            return 
+            return
           end
 
           rows = pods_list.map do |pod|
@@ -231,7 +254,7 @@ module Cluster
             ]
           end
 
-          puts Terminal::Table.new title: "Pods (namespace: #{namespace || "default"})".green, headings: ['Name', 'Status'], rows: rows
+          puts Terminal::Table.new title: "Pods (namespace: #{namespace})".green, headings: ['Name', 'Status'], rows: rows
         end
 
         def run_command command
@@ -248,4 +271,4 @@ module Cluster
             end
         end
     end
-end
+end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored