uffizzi-cli 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24e9582d66d329f45ab42194dfefbf1558843fbc94578dfc8b2127f0d7f3122
-  data.tar.gz: fa901b1e7257fc8c9384bcf11c4f41490f767dabbecbf039056aa8b0ed488f38
+  metadata.gz: 83386128e61e690def2d6afac8c8d09fe91c7f112b4834a387d74e06f04b43b4
+  data.tar.gz: 5f08710f3bb799a023fd82b8c9b1bf6e97761df925a700b45e1a8c9485e40829
 SHA512:
-  metadata.gz: cda766f7ab21158e56cfb5e5ea3dabd0416de0fd1d1671c268347465db66ce4a3864f3aa51be04a6fd789848fd6d86cbf2c3e62437aaaf63803f633b5ababc2e
-  data.tar.gz: d6e79d2994cc487a7986315371715e15a85d5d42659a4ea21361ac7e289219441ba6ee5e77468dd5380e1ee5a8b9214fed0a4894bb2b7c4f26353647c3954fcc
+  metadata.gz: 596014564e49050fbac5f36d05c47a98caf5e1bcfab48b05e4eb5ae24514c505829015430f1b1dddcf3f74690a275723f4f341c3bdd36b3f4ded718ad3573baf
+  data.tar.gz: a29224185eb40b02af15e7359e3bbfa1be06d4d76d51d3cfbb60add345d0f29f7b978dd22fc1687ca714683719db90c688b06581b815a387fd61dd1b96a78de4

data/lib/uffizzi/cli/cluster.rb

@@ -7,6 +7,11 @@ require 'uffizzi/auth_helper'
 require 'uffizzi/helpers/config_helper'
 require 'uffizzi/services/preview_service'
 require 'uffizzi/services/cluster_service'
+require 'uffizzi/services/cluster/common_service'
+require 'uffizzi/services/cluster/create_service'
+require 'uffizzi/services/cluster/delete_service'
+require 'uffizzi/services/cluster/list_service'
+require 'uffizzi/services/cluster/update_kubeconfig_service'
 require 'uffizzi/services/kubeconfig_service'
 require 'uffizzi/services/cluster/disconnect_service'
 
@@ -164,31 +169,11 @@ module Uffizzi
 
       return handle_delete_cluster(cluster_name) unless is_delete_kubeconfig
 
-      cluster_data = ClusterService.fetch_cluster_data(cluster_name, **cluster_api_connection_params)
-      kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
+      cluster_data = ClusterService.fetch_cluster_data(command_args[:cluster_name], **cluster_api_connection_params)
+      kubeconfig = ClusterCommonService.parse_kubeconfig(cluster_data[:kubeconfig])
 
       handle_delete_cluster(cluster_name)
-      exclude_kubeconfig(cluster_data[:id], kubeconfig) if kubeconfig.present?
-    end
-
-    def exclude_kubeconfig(cluster_id, kubeconfig)
-      cluster_config = Uffizzi::ConfigHelper.cluster_config_by_id(cluster_id)
-      return if cluster_config.nil?
-
-      kubeconfig_path = cluster_config[:kubeconfig_path]
-      ConfigFile.write_option(:clusters, Uffizzi::ConfigHelper.clusters_config_without(cluster_id))
-
-      KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
-        if kubeconfig_by_path.nil?
-          msg = "Warning: kubeconfig at path #{kubeconfig_path} does not exist"
-          return Uffizzi.ui.say(msg)
-        end
-
-        new_kubeconfig = KubeconfigService.exclude(kubeconfig_by_path, kubeconfig)
-        first_context = KubeconfigService.get_first_context(new_kubeconfig)
-        new_current_context = first_context.present? ? first_context['name'] : nil
-        KubeconfigService.update_current_context(new_kubeconfig, new_current_context)
-      end
+      ClusterDeleteService.exclude_kubeconfig(cluster_data[:id], kubeconfig) if kubeconfig.present?
     end
 
     def handle_delete_cluster(cluster_name)
@@ -211,10 +196,10 @@ module Uffizzi
       cluster_data = ClusterService.fetch_cluster_data(cluster_name, **cluster_api_connection_params)
 
       unless cluster_data[:kubeconfig].present?
-        say_error_update_kubeconfig(cluster_data)
+        ClusterUpdateKubeconfigService.say_error_update_kubeconfig(cluster_data)
       end
 
-      parsed_kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
+      parsed_kubeconfig = ClusterCommonService.parse_kubeconfig(cluster_data[:kubeconfig])
 
       return Uffizzi.ui.say(parsed_kubeconfig.to_yaml) if options[:print]
 
@@ -226,11 +211,11 @@ module Uffizzi
         next new_kubeconfig if kubeconfig_by_path.nil?
 
         previous_current_context = KubeconfigService.get_current_context(kubeconfig_by_path)
-        save_previous_current_context(kubeconfig_path, previous_current_context)
+        ClusterCommonService.save_previous_current_context(kubeconfig_path, previous_current_context)
         new_kubeconfig
       end
 
-      update_clusters_config(cluster_data[:id], name: cluster_name, kubeconfig_path: kubeconfig_path)
+      ClusterCommonService.update_clusters_config(cluster_data[:id], kubeconfig_path: kubeconfig_path)
 
       return if options[:quiet]
 
@@ -287,10 +272,9 @@ module Uffizzi
     end
 
     def cluster_creation_params(cluster_name)
+      manifest_content = load_manifest_file(options[:manifest])
       creation_source = options[:"creation-source"] || ClusterService::MANUAL_CREATION_SOURCE
-      manifest_file_path = options[:manifest]
       k8s_version = options[:"k8s-version"]
-      manifest_content = load_manifest_file(manifest_file_path)
 
       {
         cluster: {
@@ -327,7 +311,7 @@ module Uffizzi
       raise Uffizzi::Error.new('The project has no active clusters') if clusters.empty?
 
       clusters_data = if Uffizzi.ui.output_format.nil?
-        render_plain_cluster_list(clusters)
+        ClusterListService.render_plain_clusters(clusters)
       else
         clusters.map { |c| c.slice(:name, :project) }
       end
@@ -335,24 +319,11 @@ module Uffizzi
       Uffizzi.ui.say(clusters_data)
     end
 
-    def render_plain_cluster_list(clusters)
-      clusters.map do |cluster|
-        project_name = cluster.dig(:project, :name)
-
-        if project_name.present?
-          "- Cluster name: #{cluster[:name].strip} Project name: #{project_name.strip}"
-        else
-          "- #{cluster[:name]}"
-        end
-      end.join("\n")
-    end
-
     def handle_succeed_create_response(cluster_data)
       kubeconfig_path = options[:kubeconfig] || KubeconfigService.default_path
       is_update_current_context = options[:'update-current-context']
-      parsed_kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
-      rendered_cluster_data = render_cluster_data(cluster_data)
-      cluster_name = cluster_data[:name]
+      parsed_kubeconfig = ClusterCommonService.parse_kubeconfig(cluster_data[:kubeconfig])
+      rendered_cluster_data = build_render_cluster_data!(cluster_data)
 
       Uffizzi.ui.enable_stdout
       Uffizzi.ui.say("Cluster with name: #{rendered_cluster_data[:name]} was created.")
@@ -363,42 +334,13 @@ module Uffizzi
 
       Uffizzi.ui.say(rendered_cluster_data) if Uffizzi.ui.output_format
 
-      save_kubeconfig(parsed_kubeconfig, kubeconfig_path)
-      update_clusters_config(cluster_data[:id], name: cluster_name, kubeconfig_path: kubeconfig_path)
+      ClusterCreateService.save_kubeconfig(parsed_kubeconfig, kubeconfig_path, is_update_current_context)
+      ClusterCommonService.update_clusters_config(cluster_data[:id], name: cluster_data[:name], kubeconfig_path: kubeconfig_path)
       GithubService.write_to_github_env(rendered_cluster_data) if GithubService.github_actions_exists?
     end
 
-    def save_kubeconfig(kubeconfig, kubeconfig_path)
-      is_update_current_context = options[:'update-current-context']
-
-      KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
-        merged_kubeconfig = KubeconfigService.merge(kubeconfig_by_path, kubeconfig)
-
-        if is_update_current_context
-          new_current_context = KubeconfigService.get_current_context(kubeconfig)
-          new_kubeconfig = KubeconfigService.update_current_context(merged_kubeconfig, new_current_context)
-
-          next new_kubeconfig if kubeconfig_by_path.nil?
-
-          previous_current_context = KubeconfigService.get_current_context(kubeconfig_by_path)
-          save_previous_current_context(kubeconfig_path, previous_current_context)
-          new_kubeconfig
-        else
-          merged_kubeconfig
-        end
-      end
-
-      Uffizzi.ui.say("Kubeconfig was updated by the path: #{kubeconfig_path}") if is_update_current_context
-    end
-
-    def update_clusters_config(id, params)
-      clusters_config = Uffizzi::ConfigHelper.update_clusters_config_by_id(id, params)
-      ConfigFile.write_option(:clusters, clusters_config)
-      ConfigFile.write_option(:current_cluster, ConfigHelper.cluster_config_by_id(id))
-    end
-
-    def render_cluster_data(cluster_data)
-      kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
+    def build_render_cluster_data!(cluster_data)
+      kubeconfig = ClusterCommonService.parse_kubeconfig(cluster_data[:kubeconfig])
       raise Uffizzi::Error.new('The kubeconfig data is empty') unless kubeconfig
 
       new_cluster_data = cluster_data.slice(:name)
@@ -413,13 +355,6 @@ module Uffizzi
       Psych.safe_load(Base64.decode64(kubeconfig))
     end
 
-    def save_previous_current_context(kubeconfig_path, current_context)
-      return if kubeconfig_path.nil? || ConfigHelper.previous_current_context_by_path(kubeconfig_path).present?
-
-      previous_current_contexts = Uffizzi::ConfigHelper.set_previous_current_context_by_path(kubeconfig_path, current_context)
-      ConfigFile.write_option(:previous_current_contexts, previous_current_contexts)
-    end
-
     def handle_missing_cluster_name_error
       Uffizzi.ui.say("No kubeconfig found at #{KubeconfigService.default_path}")
       Uffizzi.ui.say('Please update the current context or provide a cluster name.')

data/lib/uffizzi/cli/dev/ingress.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'uffizzi'
+require 'uffizzi/auth_helper'
+require 'uffizzi/response_helper'
+
+module Uffizzi
+  class Cli::Dev::Ingress < Thor
+    include ApiClient
+
+    desc 'open', 'Open dev environment hosts'
+    def open
+      Uffizzi::AuthHelper.check_login
+      DevService.check_running_process!
+
+      if DevService.startup?
+        Uffizzi.ui.say_error_and_exit('Dev environment not started yet')
+      end
+
+      dev_environment = DevService.dev_environment
+      cluster_name = dev_environment[:cluster_name]
+      params = { cluster_name: cluster_name }
+      response = get_cluster_ingresses(server, project_slug, params)
+
+      return ResponseHelper.handle_failed_response(response) unless ResponseHelper.ok?(response)
+
+      ingress_hosts = response.dig(:body, :ingresses)
+      urls = ingress_hosts.map { |host| "https://#{host}" }
+      urls.each { |url| Uffizzi.launchy.open(url) { Uffizzi.ui.say(url) } }
+    end
+
+    private
+
+    def server
+      @server ||= ConfigFile.read_option(:server)
+    end
+
+    def project_slug
+      @project_slug ||= ConfigFile.read_option(:project)
+    end
+  end
+end

data/lib/uffizzi/cli/dev.rb

@@ -9,6 +9,10 @@ module Uffizzi
   class Cli::Dev < Thor
     include ApiClient
 
+    desc 'ingress', 'Show the compose dev environment ingress info'
+    require_relative 'dev/ingress'
+    subcommand 'ingress', Uffizzi::Cli::Dev::Ingress
+
     desc 'start [CONFIG]', 'Start dev environment'
     method_option :quiet, type: :boolean, aliases: :q
     method_option :'default-repo', type: :string
@@ -222,8 +226,8 @@ module Uffizzi
     def launch_demonise_skaffold(config_path)
       Uffizzi.process.daemon(true)
 
-      at_exit do
-        DevService.delete_pid
+      Uffizzi.at_exit do
+        DevService.stop_process
       end
 
       DevService.save_pid
@@ -235,8 +239,8 @@ module Uffizzi
     end
 
     def launch_basic_skaffold(config_path)
-      at_exit do
-        DevService.delete_pid
+      Uffizzi.at_exit do
+        DevService.stop_process
       end
 
       DevService.save_pid

data/lib/uffizzi/clients/api/api_client.rb

@@ -293,6 +293,13 @@ module ApiClient
     build_response(response)
   end
 
+  def get_cluster_ingresses(server, project_slug, params)
+    uri = project_cluster_ingresses_uri(server, project_slug, cluster_name: params[:cluster_name], oidc_token: params[:oidc_token])
+    response = http_client.make_get_request(uri)
+
+    build_response(response)
+  end
+
   def get_access_token(server, code)
     uri = access_token_url(server, code)
     response = http_client.make_get_request(uri)

data/lib/uffizzi/clients/api/api_routes.rb

@@ -104,6 +104,12 @@ module ApiRoutes
     "#{server}/api/cli/v1/projects/#{project_slug}/clusters?token=#{oidc_token}"
   end
 
+  def project_cluster_ingresses_uri(server, project_slug, cluster_name:, oidc_token:)
+    url = "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}/ingresses"
+
+    oidc_token.nil? ? url : url + "?token=#{oidc_token}"
+  end
+
   def cluster_uri(server, project_slug, cluster_name:, oidc_token:)
     return "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}" if oidc_token.nil?
 

data/lib/uffizzi/services/cluster/common_service.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'uffizzi/helpers/config_helper'
+
+class ClusterCommonService
+  class << self
+    def save_previous_current_context(kubeconfig_path, current_context)
+      return if kubeconfig_path.nil? || Uffizzi::ConfigHelper.previous_current_context_by_path(kubeconfig_path).present?
+
+      previous_current_contexts = Uffizzi::ConfigHelper.set_previous_current_context_by_path(kubeconfig_path, current_context)
+      Uffizzi::ConfigFile.write_option(:previous_current_contexts, previous_current_contexts)
+    end
+
+    def update_clusters_config(id, params)
+      clusters_config = Uffizzi::ConfigHelper.update_clusters_config_by_id(id, params)
+      Uffizzi::ConfigFile.write_option(:clusters, clusters_config)
+    end
+
+    def parse_kubeconfig(kubeconfig)
+      return if kubeconfig.nil?
+
+      Psych.safe_load(Base64.decode64(kubeconfig))
+    end
+  end
+end

data/lib/uffizzi/services/cluster/create_service.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'uffizzi/helpers/config_helper'
+require 'uffizzi/services/cluster/common_service'
+require 'uffizzi/services/kubeconfig_service'
+
+class ClusterCreateService
+  class << self
+    def save_kubeconfig(kubeconfig, kubeconfig_path, is_update_current_context)
+      kubeconfig_path = kubeconfig_path.nil? ? KubeconfigService.default_path : kubeconfig_path
+      KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
+        merged_kubeconfig = KubeconfigService.merge(kubeconfig_by_path, kubeconfig)
+
+        if is_update_current_context
+          new_current_context = KubeconfigService.get_current_context(kubeconfig)
+          new_kubeconfig = KubeconfigService.update_current_context(merged_kubeconfig, new_current_context)
+
+          next new_kubeconfig if kubeconfig_by_path.nil?
+
+          previous_current_context = KubeconfigService.get_current_context(kubeconfig_by_path)
+          ClusterCommonService.save_previous_current_context(kubeconfig_path, previous_current_context)
+          new_kubeconfig
+        else
+          merged_kubeconfig
+        end
+      end
+    end
+  end
+end

data/lib/uffizzi/services/cluster/delete_service.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'uffizzi/helpers/config_helper'
+require 'uffizzi/services/kubeconfig_service'
+
+class ClusterDeleteService
+  class << self
+    def exclude_kubeconfig(cluster_id, kubeconfig)
+      cluster_config = Uffizzi::ConfigHelper.cluster_config_by_id(cluster_id)
+      return if cluster_config.nil?
+
+      kubeconfig_path = cluster_config[:kubeconfig_path]
+      Uffizzi::ConfigFile.write_option(:clusters, Uffizzi::ConfigHelper.clusters_config_without(cluster_id))
+
+      KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
+        if kubeconfig_by_path.nil?
+          msg = "Warning: kubeconfig at path #{kubeconfig_path} does not exist"
+          return Uffizzi.ui.say(msg)
+        end
+
+        new_kubeconfig = KubeconfigService.exclude(kubeconfig_by_path, kubeconfig)
+        first_context = KubeconfigService.get_first_context(new_kubeconfig)
+        new_current_context = first_context.present? ? first_context['name'] : nil
+        KubeconfigService.update_current_context(new_kubeconfig, new_current_context)
+      end
+    end
+  end
+end

data/lib/uffizzi/services/cluster/list_service.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class ClusterListService
+  class << self
+    # REFACTOR_ME:
+    # Uffizzi.ui.output_format = Uffizzi::UI::Shell::PRETTY_LIST
+    # Uffizzi.ui.say(data)
+    def render_plain_clusters(clusters)
+      clusters.map do |cluster|
+        project_name = cluster.dig(:project, :name)
+
+        if project_name.present?
+          "- Cluster name: #{cluster[:name].strip} Project name: #{project_name.strip}"
+        else
+          "- #{cluster[:name]}"
+        end
+      end.join("\n")
+    end
+  end
+end

data/lib/uffizzi/services/cluster/update_kubeconfig_service.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'uffizzi/helpers/config_helper'
+require 'uffizzi/services/kubeconfig_service'
+
+class ClusterUpdateKubeconfigService
+  class << self
+    def say_error_update_kubeconfig(cluster_data)
+      if ClusterService.failed?(cluster_data[:state])
+        Uffizzi.ui.say_error_and_exit('Kubeconfig is empty because cluster failed to be created.')
+      end
+
+      if ClusterService.deploying?(cluster_data[:state])
+        Uffizzi.ui.say_error_and_exit('Kubeconfig is empty because cluster is deploying.')
+      end
+
+      if ClusterService.deployed?(cluster_data[:state])
+        raise Error.new("Cluster with data: #{cluster_data.to_json} is deployed but kubeconfig does not exist.")
+      end
+    end
+  end
+end

data/lib/uffizzi/services/dev_service.rb

@@ -32,13 +32,27 @@ class DevService
       dev_pid = running_pid
       skaffold_pid = running_skaffold_pid
 
-      Uffizzi.process.kill('INT', skaffold_pid)
-      Uffizzi.process.kill('INT', dev_pid)
+      begin
+        Uffizzi.process.kill('INT', skaffold_pid)
+      rescue Errno::ESRCH
+      end
+
+      wait_process_stop(skaffold_pid)
       delete_pid
+
+      Uffizzi.process.kill('INT', dev_pid)
     rescue Errno::ESRCH
       delete_pid
     end
 
+    def wait_process_stop(pid)
+      loop do
+        Uffizzi.process.kill(0, pid)
+        sleep(1)
+      end
+    rescue Errno::ESRCH
+    end
+
     def process_running?
       pid = running_pid
       return false unless pid.positive?
@@ -50,9 +64,9 @@ class DevService
     end
 
     def start_check_pid_file_existence
-      Thread.new do
+      Uffizzi.thread.new do
         loop do
-          Uffizzi.process.kill('QUIT', Uffizzi.process.pid) unless File.exist?(pid_path)
+          stop_process unless File.exist?(pid_path)
           sleep(1)
         end
       end
@@ -62,6 +76,8 @@ class DevService
       Uffizzi.ui.say('Start skaffold')
       cmd = build_skaffold_dev_command(config_path, options)
 
+      Uffizzi.signal.trap('INT') {}
+
       Uffizzi.ui.popen2e(cmd) do |_stdin, stdout_and_stderr, wait_thr|
         pid = wait_thr.pid
         skaffold_pid = find_skaffold_pid(pid)
@@ -198,13 +214,29 @@ class DevService
       Uffizzi::ConfigHelper.dev_environment
     end
 
-    def find_skaffold_pid(ppid)
-      ppid_regex = /\w*\s+\d+\s+#{ppid}.*\sskaffold dev/
-      pid_regex = /\w*\s+(\d+)\s+#{ppid}.*\sskaffold dev/
-
+    def find_skaffold_pid(pid)
+      pid_regex = /\w*#{pid}.*skaffold dev/
       io = Uffizzi.ui.popen('ps -ef')
-      ps = io.readlines.detect { |l| l.match?(ppid_regex) }
-      ps.match(pid_regex)[1]
+      processes = io.readlines.select { |l| l.match?(pid_regex) }
+
+      if processes.count.zero?
+        raise StandardError.new('Can\'t find skaffold process pid')
+      end
+
+      # HACK: For MacOS
+      if processes.count == 1
+        current_pid = processes[0].gsub(/\s+/, ' ').lstrip.split[1]
+        return pid if current_pid.to_s == pid.to_s
+
+        raise StandardError.new('Can\'t find skaffold process pid')
+      end
+
+      # HACK: For Linux
+      parent_process = processes
+        .map { |ps| ps.gsub(/\s+/, ' ').lstrip.split }
+        .detect { |ps| ps[2].to_s == pid.to_s }
+
+      parent_process[1]
     end
   end
 end

data/lib/uffizzi/shell.rb

@@ -83,7 +83,7 @@ module Uffizzi
         when Array
           data.map { |v| format_to_pretty_list(v) }.join("\n\n")
         when Hash
-          data.map { |k, v| "- #{k.to_s.upcase}: #{v}" }.join("\n").strip
+          data.map { |k, v| "- #{k.to_s.capitalize.gsub('_', ' ')}: #{v}" }.join("\n").strip
         else
           data
         end

data/lib/uffizzi/version.rb

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

data/lib/uffizzi.rb

@@ -6,6 +6,7 @@ require 'sentry-ruby'
 require 'active_support'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
+require 'launchy'
 
 require 'thor'
 require 'uffizzi/error'
@@ -38,7 +39,23 @@ module Uffizzi
     end
 
     def process
-      @process ||= Process
+      Process
+    end
+
+    def signal
+      Signal
+    end
+
+    def thread
+      Thread
+    end
+
+    def at_exit(&block)
+      Kernel.at_exit(&block)
+    end
+
+    def launchy
+      Launchy
     end
   end
 end

data/man/uffizzi-cluster-create

@@ -1,8 +1,10 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-CLUSTER\-CREATE" "" "September 2023" ""
+.TH "UFFIZZI\-CLUSTER\-CREATE" "" "October 2023" ""
 .SH "NAME"
-\fBuffizzi\-cluster\-create\fR \- create a cluster
+\fBuffizzi\-cluster\-create\fR
+.P
+uffizzi cluster create \-h uffizzi\-cluster\-create \- create a cluster ================================================================
 .SH "SYNOPSIS"
 .nf
 uffizzi cluster create [CLUSTER_NAME]
@@ -19,7 +21,14 @@ https://docs\.uffizzi\.com/references/cli/
 .nf
 \-\-name
     Option is deprecated and will be removed in the newer versions\.
-    Please use a positional argument instead: uffizzi cluster create my\-awesome\-name\.
+    Please use a positional argument instead: uffizzi cluster create
+    my\-awesome\-name\.
+
+\-\-k8s\-version=<api\-version>
+    Specify which version of the Kubernetes API to use when creating
+    the cluster, formatted as [MAJOR]\.[MINOR]\. Defaults to 1\.27\.
+    Minor versions point to the latest release of the corresponding k3s
+    minor version\. See https://github\.com/k3s\-io/k3s/releases
 
 \-\-kubeconfig="/path/to/your/kubeconfig"
     Path to kubeconfig file

data/man/uffizzi-dev-ingress

@@ -0,0 +1,27 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-DEV\-INGRESS" "" "October 2023" ""
+.SH "NAME"
+\fBuffizzi\-dev\-ingress\fR
+.P
+$ uffizzi dev ingress \-h uffizzi\-dev\-ingress \- show the dev environment ingress ================================================================
+.SH "SYNOPSIS"
+.nf
+uffizzi dev ingress COMMAND
+.fi
+.SH "DESCRIPTION"
+.nf
+Show the dev environment ingress
+
+For more information on Uffizzi clusters, see:
+https://docs\.uffizzi\.com/references/cli/
+.fi
+.SH "COMMANDS"
+.nf
+COMMAND is one of the following:
+
+ open
+    Open the dev environment ingress hosts in browser
+.fi
+.SH "Run \'uffizzi dev ingress COMMAND \-\-help\' for more information on a command\."
+

data/man/uffizzi-dev-ingress-open

@@ -0,0 +1,26 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-DEV\-INGRESS\-OPEN" "" "October 2023" ""
+.SH "NAME"
+\fBuffizzi\-dev\-ingress\-open\fR
+.P
+$ uffizzi dev ingress \-h uffizzi\-dev\-ingress\-open \- open the dev environment ingress hosts in browser ================================================================
+.SH "SYNOPSIS"
+.nf
+uffizzi dev ingress open
+.fi
+.SH "DESCRIPTION"
+.nf
+Open the dev environment ingress hosts in browser
+
+For more information on Uffizzi clusters, see:
+https://docs\.uffizzi\.com/references/cli/
+.fi
+.SH "EXAMPLES"
+.nf
+The following command open the dev environment
+ingress hosts in browser:
+
+    $ uffizzi dev ingress open
+.fi
+

data/man/uffizzi-dev-ingress-open.ronn

@@ -0,0 +1,18 @@
+$ uffizzi dev ingress -h
+uffizzi-dev-ingress-open - open the dev environment ingress hosts in browser
+================================================================
+
+## SYNOPSIS
+    uffizzi dev ingress open
+
+## DESCRIPTION
+    Open the dev environment ingress hosts in browser
+
+    For more information on Uffizzi clusters, see:
+    https://docs.uffizzi.com/references/cli/
+
+## EXAMPLES
+    The following command open the dev environment
+    ingress hosts in browser:
+
+        $ uffizzi dev ingress open

data/man/uffizzi-dev-ingress.ronn

@@ -0,0 +1,21 @@
+$ uffizzi dev ingress -h
+uffizzi-dev-ingress - show the dev environment ingress
+================================================================
+
+## SYNOPSIS
+    uffizzi dev ingress COMMAND
+
+## DESCRIPTION
+    Show the dev environment ingress
+
+    For more information on Uffizzi clusters, see:
+    https://docs.uffizzi.com/references/cli/
+
+## COMMANDS
+    COMMAND is one of the following:
+
+     open
+        Open the dev environment ingress hosts in browser
+
+##
+Run 'uffizzi dev ingress COMMAND --help' for more information on a command.

data/man/uffizzi-dev-start

@@ -37,10 +37,11 @@ https://docs\.uffizzi\.com/references/cli/
 .fi
 .SH "FLAGS"
 .nf
- \-\-build="<local\-or\-remote>"
-    This option specifies whether to build images on the
-    local environment or on the remote Uffizzi cluster\.
-    Possible values are "local" or "remote"\.
+ \-\-k8s\-version=<api\-version>
+    Specify which version of the Kubernetes API to use when creating
+    the cluster, formatted as [MAJOR]\.[MINOR]\. Defaults to 1\.27\.
+    Minor versions point to the latest release of the corresponding k3s
+    minor version\. See https://github\.com/k3s\-io/k3s/releases
 
  \-\-default\-repo="<container\-registry\-domain>"
     A public or private repo used to push/pull build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -424,6 +424,7 @@ files:
 - lib/uffizzi/cli/config.rb
 - lib/uffizzi/cli/connect.rb
 - lib/uffizzi/cli/dev.rb
+- lib/uffizzi/cli/dev/ingress.rb
 - lib/uffizzi/cli/disconnect.rb
 - lib/uffizzi/cli/login.rb
 - lib/uffizzi/cli/login_by_identity_token.rb
@@ -446,7 +447,12 @@ files:
 - lib/uffizzi/helpers/project_helper.rb
 - lib/uffizzi/promt.rb
 - lib/uffizzi/response_helper.rb
+- lib/uffizzi/services/cluster/common_service.rb
+- lib/uffizzi/services/cluster/create_service.rb
+- lib/uffizzi/services/cluster/delete_service.rb
 - lib/uffizzi/services/cluster/disconnect_service.rb
+- lib/uffizzi/services/cluster/list_service.rb
+- lib/uffizzi/services/cluster/update_kubeconfig_service.rb
 - lib/uffizzi/services/cluster_service.rb
 - lib/uffizzi/services/compose_file_service.rb
 - lib/uffizzi/services/dev_service.rb
@@ -524,6 +530,10 @@ files:
 - man/uffizzi-dev
 - man/uffizzi-dev-describe
 - man/uffizzi-dev-describe.ronn
+- man/uffizzi-dev-ingress
+- man/uffizzi-dev-ingress-open
+- man/uffizzi-dev-ingress-open.ronn
+- man/uffizzi-dev-ingress.ronn
 - man/uffizzi-dev-start
 - man/uffizzi-dev-start.ronn
 - man/uffizzi-dev-stop