uffizzi-cli 2.4.8 → 2.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d357e75482392caf7a0dcf00cc15e527947af62ec9a00186ab79b94ccfc8b3e
-  data.tar.gz: 3b8af8bc628b4ab6398cf4acfda863e7560e21861ae89dbcc82cdf0902e496bc
+  metadata.gz: 208b6ac1dfb59b5b76aac7cc0b4a21c8b4c725e8e843958fe10b98bdd50ec43f
+  data.tar.gz: 7335a86326e93a84dbf67f31b3182d18a6fbf88a9e4ce4a4c04af265c68f3809
 SHA512:
-  metadata.gz: 3e0c676e7a8af1a2054e1155dea4b866447760d1b88ccea22cfed911a1231718f3f46d721d1a02c5df83e168c4b4f421343f9309b2cc35a4ad9283dacb2031c1
-  data.tar.gz: d241444a8ee0e01406b42ff4797aed2e52c26fb386d330ed252ba94b7e2763d48224b55e6a00069386b05ee70c68b13e488901627f4a5a35c9555f583a936b8f
+  metadata.gz: 5302d2e8db9c5afb7c2550d45a15125d98efd472f8ae6902739b6900260719d213b1c71d79050e70018ad4381849155a2cc0730ae89d9af1f7268e10f08af7ab
+  data.tar.gz: fbaf9bdba63f98ce1811d70e1388f9823baa32bf6bb28469e6e48a41d41d8b4e477b99addef053b290acfdc606f7ae5600c4ba77c2a5db4fed7356bca28c158c

data/lib/uffizzi/cli/install.rb

@@ -71,18 +71,18 @@ module Uffizzi
       }
     end
 
-    def wait_ip
-      spinner = TTY::Spinner.new('[:spinner] Waiting IP addess...', format: :dots)
+    def wait_endpoint
+      spinner = TTY::Spinner.new('[:spinner] Waiting on IP address...', format: :dots)
       spinner.auto_spin
 
-      ip = nil
+      endpoint = nil
       try = 0
 
       loop do
-        ip = InstallService.get_controller_ip(namespace)
-        break if ip.present?
+        endpoint = InstallService.get_controller_endpoint(namespace)
+        break if endpoint.present?
 
-        if try == 30
+        if try == 90
           spinner.error
 
           return 'unknown'
@@ -94,30 +94,7 @@ module Uffizzi
 
       spinner.success
 
-      ip
-    end
-
-    def wait_certificate_request_ready(uri)
-      spinner = TTY::Spinner.new('[:spinner] Waiting create certificate for controller host...', format: :dots)
-      spinner.auto_spin
-
-      try = 0
-
-      loop do
-        requests = InstallService.get_certificate_request(namespace, uri)
-        break if requests.all? { |r| r['status'].downcase == 'true' }
-
-        if try == 60
-          spinner.error
-
-          return Uffizzi.ui.say('Stop waiting creation certificate')
-        end
-
-        try += 1
-        sleep(2)
-      end
-
-      spinner.success
+      endpoint
     end
 
     def build_helm_values(params)
@@ -219,11 +196,10 @@ module Uffizzi
     end
 
     def say_success(uri)
-      ip_address = wait_ip
-      wait_certificate_request_ready(uri)
+      endpoint = wait_endpoint
 
       msg = 'Your Uffizzi controller is ready. To configure DNS,'\
-            " create a record for the hostname '*.#{uri.host}' pointing to '#{ip_address}'"
+            " create a record for the hostname '*.#{uri.host}' pointing to '#{endpoint}'"
       Uffizzi.ui.say(msg)
     end
 

data/lib/uffizzi/cli/uninstall.rb

@@ -12,7 +12,7 @@ module Uffizzi
     default_task :controller
 
     desc 'controller [HOSTNAME]', 'Install uffizzi controller to cluster'
-    method_option :namespace, type: :string
+    method_option :namespace, type: :string, aliases: '-n'
     method_option :context, type: :string
     def controller
       Uffizzi::AuthHelper.check_login
@@ -86,7 +86,7 @@ module Uffizzi
     end
 
     def namespace
-      options[:namespace] || InstallService::DEFAULT_NAMESPACE
+      options[:namespace] || InstallService.current_namespace
     end
 
     def server

data/lib/uffizzi/services/install_service.rb

@@ -85,7 +85,7 @@ class InstallService
       execute_command(cmd, say: false) { |stdout| stdout.present? && stdout.chop }
     end
 
-    def get_controller_ip(namespace)
+    def get_controller_endpoint(namespace)
       cmd = "kubectl get ingress -n #{namespace} -o json"
       res = execute_command(cmd, say: false)
       ingress = JSON.parse(res)['items'].detect { |i| i['metadata']['name'] = INGRESS_NAME }
@@ -95,18 +95,10 @@ class InstallService
       load_balancers = ingress.dig('status', 'loadBalancer', 'ingress')
       return if load_balancers.blank?
 
-      load_balancers.map { |i| i['ip'] }[0]
-    end
-
-    def get_certificate_request(namespace, uri)
-      cmd = "kubectl get certificaterequests -n #{namespace} -o json"
-      res = execute_command(cmd, say: false)
-      certificate_request = JSON.parse(res)['items'].detect { |i| i['metadata']['name'].include?(uri.host) }
-
-      return [] if certificate_request.nil?
+      ip = load_balancers.map { |i| i['ip'] }[0]
+      return ip if ip.present?
 
-      conditions = certificate_request.dig('status', 'conditions') || []
-      conditions.map { |c| c.slice('type', 'status') }
+      load_balancers.map { |i| i['hostname'] }[0]
     end
 
     def build_controller_host(host)
@@ -130,6 +122,14 @@ class InstallService
       File.dirname(Uffizzi::ConfigFile.config_path)
     end
 
+    def current_namespace
+      path = KubeconfigService.default_path
+      kubeconfig = KubeconfigService.read_kubeconfig(path)
+      return if kubeconfig.nil?
+
+      KubeconfigService.get_current_namespace(kubeconfig) || DEFAULT_NAMESPACE
+    end
+
     private
 
     def execute_command(command, say: true, skip_error: false)

data/lib/uffizzi/services/kubeconfig_service.rb

@@ -50,6 +50,12 @@ class KubeconfigService
         .dig('context', 'cluster')
     end
 
+    def get_current_namespace(kubeconfig)
+      get_cluster_contexts(kubeconfig)
+        .detect { |c| c['name'] == get_current_context(kubeconfig) }
+        .dig('context', 'namespace')
+    end
+
     def get_cluster_contexts(kubeconfig)
       kubeconfig.fetch('contexts', [])
     end

data/lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.4.8'
+  VERSION = '2.4.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.10
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport