uffizzi-cli 2.4.7 → 2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d5ba713ecb457d3cb8f344936b8192c76bed2951fc22036d4416e2267b00fd0
-  data.tar.gz: d1f0324a8b54de3282c2215ed9b68af1fc9c5d9fc54593647431bc7b57279c87
+  metadata.gz: 744480393ee81d335802bcb1008333c1e6c9b6f9870d7710dfff294698a1eb7a
+  data.tar.gz: cf43c7519e0621f9be3fbb18d9fd89fd0cf2a6ea0dc56d0b41662428e6d4b46c
 SHA512:
-  metadata.gz: 966f0569cd79e933a4d1c62fe2c031b4856a92e36aa8804c62bc2f73d5faee9d0f325783921cda96c2bcf3b67504c39529c5baccfba2549c3762e13f6f517375
-  data.tar.gz: 616709d553d89ef6ac020360c41173a2756fed3582fa35e4c3eacca29cf919a29aaa68a8ef1ea912d63814a13890f6bbdc74cb7783a9e7e9e40f21979dbb0167
+  metadata.gz: ef39ee4ce26c553068d279f3960ba924b7458fbf439a4ffd0abbed363fa359cbf9707df59e8ee439ff06f091894836f67d7bcdb8f2c78879caa7b52120e2dfb2
+  data.tar.gz: 6c0471f16b076c5c8dedd2b714416c6514e03f9ee96b6d6aead5d5fca19556ac6f09e73b44a050ef07f7cdcfd3a72d9bb2b14902eda9931b5251830389aacc57

data/lib/uffizzi/cli/cluster.rb

@@ -35,7 +35,6 @@ module Uffizzi
     method_option :output, required: false, type: :string, aliases: '-o', enum: ['json', 'pretty-json']
     method_option :'creation-source', required: false, type: :string
     method_option :'k8s-version', required: false, type: :string
-    method_option :'node-selector', required: false, type: :string
     def create(name = nil)
       run('create', { name: name })
     end
@@ -262,7 +261,6 @@ module Uffizzi
       manifest_content = load_manifest_file(options[:manifest])
       creation_source = options[:"creation-source"] || ClusterService::MANUAL_CREATION_SOURCE
       k8s_version = options[:"k8s-version"]
-      node_selector = options[:"node-selector"]
 
       {
         cluster: {
@@ -270,7 +268,6 @@ module Uffizzi
           manifest: manifest_content,
           creation_source: creation_source,
           k8s_version: k8s_version,
-          node_selector: node_selector,
         },
         token: oidc_token,
       }

data/lib/uffizzi/cli/install.rb

@@ -17,6 +17,7 @@ module Uffizzi
     method_option :context, type: :string
     method_option :issuer, type: :string, enum: ['letsencrypt', 'zerossl']
     method_option :'repo-url', type: :string
+    method_option :'node-selector-template', required: false, type: :string
     def controller(hostname)
       Uffizzi::AuthHelper.check_login
 
@@ -66,11 +67,12 @@ module Uffizzi
         controller_password: generate_password,
         cert_email: options[:email],
         cluster_issuer: options[:issuer] || InstallService::DEFAULT_CLUSTER_ISSUER,
+        node_selector_template: options[:"node-selector-template"],
       }
     end
 
     def wait_ip
-      spinner = TTY::Spinner.new('[:spinner] Waiting IP addess...', format: :dots)
+      spinner = TTY::Spinner.new('[:spinner] Waiting on IP address...', format: :dots)
       spinner.auto_spin
 
       ip = nil
@@ -80,7 +82,7 @@ module Uffizzi
         ip = InstallService.get_controller_ip(namespace)
         break if ip.present?
 
-        if try == 30
+        if try == 90
           spinner.error
 
           return 'unknown'
@@ -95,29 +97,6 @@ module Uffizzi
       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
-    end
-
     def build_helm_values(params)
       {
         global: {
@@ -212,12 +191,12 @@ module Uffizzi
         managed_dns_zone: uri.host,
         login: installation_options[:controller_username],
         password: installation_options[:controller_password],
+        node_selector_template: installation_options[:node_selector_template],
       }
     end
 
     def say_success(uri)
       ip_address = wait_ip
-      wait_certificate_request_ready(uri)
 
       msg = 'Your Uffizzi controller is ready. To configure DNS,'\
             " create a record for the hostname '*.#{uri.host}' pointing to '#{ip_address}'"

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

@@ -98,17 +98,6 @@ class InstallService
       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?
-
-      conditions = certificate_request.dig('status', 'conditions') || []
-      conditions.map { |c| c.slice('type', 'status') }
-    end
-
     def build_controller_host(host)
       [DEFAULT_CONTROLLER_DOMAIN_PREFIX, host].join('.')
     end
@@ -130,6 +119,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.7'
+  VERSION = '2.4.9'
 end

data/lib/uffizzi.rb

@@ -7,6 +7,7 @@ require 'active_support'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
 require 'launchy'
+require 'base64'
 
 require 'thor'
 require 'uffizzi/error'

metadata

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