From f6cd8cf90e0c90e8a774e357ae6b4828f3e05c7c Mon Sep 17 00:00:00 2001
From: Lidia Mokevnina <lidia.mokevnina@dualbootpartners.com>
Date: Thu, 14 Mar 2024 17:50:39 +0100
Subject: [PATCH 1/4] [505] added node selector template to the install command

---
 lib/uffizzi/cli/cluster.rb | 3 ---
 lib/uffizzi/cli/install.rb | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/uffizzi/cli/cluster.rb b/lib/uffizzi/cli/cluster.rb
index 80e98bc2..b4041a5c 100644
--- a/lib/uffizzi/cli/cluster.rb
+++ b/lib/uffizzi/cli/cluster.rb
@@ -35,7 +35,6 @@ def list
     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 @@ def cluster_creation_params(cluster_name)
       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 @@ def cluster_creation_params(cluster_name)
           manifest: manifest_content,
           creation_source: creation_source,
           k8s_version: k8s_version,
-          node_selector: node_selector,
         },
         token: oidc_token,
       }
diff --git a/lib/uffizzi/cli/install.rb b/lib/uffizzi/cli/install.rb
index c421f162..7671352b 100644
--- a/lib/uffizzi/cli/install.rb
+++ b/lib/uffizzi/cli/install.rb
@@ -17,6 +17,7 @@ class Cli::Install < Thor
     method_option :context, type: :string
     method_option :issuer, type: :string, enum: ['letsencrypt', 'zerossl']
     method_option :'repo-url', type: :string
+    method_option :'node-selector', required: false, type: :string
     def controller(hostname)
       Uffizzi::AuthHelper.check_login
 
@@ -66,6 +67,7 @@ def build_installation_options(uri)
         controller_password: generate_password,
         cert_email: options[:email],
         cluster_issuer: options[:issuer] || InstallService::DEFAULT_CLUSTER_ISSUER,
+        node_selector_template: options[:"node-selector-template"],
       }
     end
 
@@ -212,6 +214,7 @@ def build_controller_setting_params(uri, installation_options)
         managed_dns_zone: uri.host,
         login: installation_options[:controller_username],
         password: installation_options[:controller_password],
+        node_selector_template: installation_options[:node_selector_template],
       }
     end
 

From 968f4d5f9f23b28c755d87d1575bafe076acdbde Mon Sep 17 00:00:00 2001
From: Lidia Mokevnina <lidia.mokevnina@dualbootpartners.com>
Date: Thu, 14 Mar 2024 18:45:13 +0100
Subject: [PATCH 2/4] [505] added import of base64

---
 lib/uffizzi.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/uffizzi.rb b/lib/uffizzi.rb
index 106fde41..c3e9c3c8 100644
--- a/lib/uffizzi.rb
+++ b/lib/uffizzi.rb
@@ -7,6 +7,7 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
 require 'launchy'
+require 'base64'
 
 require 'thor'
 require 'uffizzi/error'

From b4ec354e214d2e042e9ae9c62432cedb77e3c0b5 Mon Sep 17 00:00:00 2001
From: Lidia Mokevnina <lidia.mokevnina@dualbootpartners.com>
Date: Thu, 14 Mar 2024 18:55:00 +0100
Subject: [PATCH 3/4] [505] fixed option name

---
 lib/uffizzi/cli/install.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/uffizzi/cli/install.rb b/lib/uffizzi/cli/install.rb
index 7671352b..a2f0f4e7 100644
--- a/lib/uffizzi/cli/install.rb
+++ b/lib/uffizzi/cli/install.rb
@@ -17,7 +17,7 @@ class Cli::Install < Thor
     method_option :context, type: :string
     method_option :issuer, type: :string, enum: ['letsencrypt', 'zerossl']
     method_option :'repo-url', type: :string
-    method_option :'node-selector', required: false, type: :string
+    method_option :'node-selector-template', required: false, type: :string
     def controller(hostname)
       Uffizzi::AuthHelper.check_login
 

From 77ad3d765505cf43049ecea293c7f13f16667c58 Mon Sep 17 00:00:00 2001
From: Lidia Mokevnina <lidia.mokevnina@dualbootpartners.com>
Date: Fri, 15 Mar 2024 20:04:29 +0100
Subject: [PATCH 4/4] Change version to 2.4.8

---
 Gemfile.lock           | 2 +-
 lib/uffizzi/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b3f35b90..4b77748f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (2.4.7)
+    uffizzi-cli (2.4.8)
       activesupport
       awesome_print
       faker
diff --git a/lib/uffizzi/version.rb b/lib/uffizzi/version.rb
index ba26e817..f0874fe7 100644
--- a/lib/uffizzi/version.rb
+++ b/lib/uffizzi/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.4.7'
+  VERSION = '2.4.8'
 end