From a14b2781487190d3c4d9c8bb46dc8f7132b593ec Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Mon, 9 Oct 2023 11:26:07 +0200 Subject: [PATCH] [346] added k8s version option --- lib/uffizzi/cli/cluster.rb | 26 ++++++++++++++++++-------- man/uffizzi-cluster-create.ronn | 11 ++++++++++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/uffizzi/cli/cluster.rb b/lib/uffizzi/cli/cluster.rb index cd3e67f5..8b1945f7 100644 --- a/lib/uffizzi/cli/cluster.rb +++ b/lib/uffizzi/cli/cluster.rb @@ -12,6 +12,7 @@ require 'uffizzi/services/cluster/disconnect_service' MANUAL = 'manual' +DEFAULT_K8S_VERSION = '1.27' module Uffizzi class Cli::Cluster < Thor @@ -32,6 +33,7 @@ def list method_option :'update-current-context', type: :boolean, required: false, default: true 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, default: '1.27' def create(name = nil) run('create', { name: name }) end @@ -116,13 +118,16 @@ def handle_create_command(project_slug, command_args) cluster_name = command_args[:name] || options[:name] || ClusterService.generate_name creation_source = options[:"creation-source"] || MANUAL - - unless ClusterService.valid_name?(cluster_name) - Uffizzi.ui.say_error_and_exit("Cluster name: #{cluster_name} is not valid.") - end - - manifest_file_path = options[:manifest] - params = cluster_creation_params(cluster_name, creation_source, manifest_file_path) + k8s_version = options[:k8s_version] || DEFAULT_K8S_VERSION + Uffizzi.ui.say_error_and_exit('k8s version should be formatted as [MAJOR].[MINOR].') unless valid_k8s_version?(k8s_version) + Uffizzi.ui.say_error_and_exit("Cluster name: #{cluster_name} is not valid.") unless ClusterService.valid_name?(cluster_name) + + params = cluster_creation_params( + name: cluster_name, + creation_source: creation_source, + manifest_file_path: options[:manifest], + k8s_version: k8s_version, + ) response = create_cluster(ConfigFile.read_option(:server), project_slug, params) return ResponseHelper.handle_failed_response(response) unless ResponseHelper.created?(response) @@ -241,7 +246,7 @@ def say_error_update_kubeconfig(cluster_data) end end - def cluster_creation_params(name, creation_source, manifest_file_path) + def cluster_creation_params(name:, creation_source:, manifest_file_path:, k8s_version:) manifest_content = load_manifest_file(manifest_file_path) oidc_token = Uffizzi::ConfigFile.read_option(:oidc_token) @@ -250,6 +255,7 @@ def cluster_creation_params(name, creation_source, manifest_file_path) name: name, manifest: manifest_content, creation_source: creation_source, + k8s_version: k8s_version, }, token: oidc_token, } @@ -399,5 +405,9 @@ def save_previous_current_context(kubeconfig_path, current_context) 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 valid_k8s_version?(version) + ['1.28', '1.27', '1.26'].include?(version) + end end end diff --git a/man/uffizzi-cluster-create.ronn b/man/uffizzi-cluster-create.ronn index 0420fe82..bed1e943 100644 --- a/man/uffizzi-cluster-create.ronn +++ b/man/uffizzi-cluster-create.ronn @@ -1,3 +1,4 @@ +uffizzi cluster create -h uffizzi-cluster-create - create a cluster ================================================================ @@ -12,9 +13,17 @@ uffizzi-cluster-create - create a cluster https://docs.uffizzi.com/references/cli/ ## FLAGS + --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= + 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