Merge pull request #646 from vitobotta:config-refactoring

Config refactoring

Author: vitobotta

.gitignore

@@ -38,3 +38,4 @@ delete.log
 /.bws/
 /bitwarden-state/
 .env
+hetzner-k3s-bin

src/cluster/create.cr

@@ -13,7 +13,7 @@ class Cluster::Create
   private getter configuration : Configuration::Loader
   private getter hetzner_client : Hetzner::Client { configuration.hetzner_client }
   private getter settings : Configuration::Main { configuration.settings }
-  private getter autoscaling_worker_node_pools : Array(Configuration::WorkerNodePool) { settings.worker_node_pools.select(&.autoscaling_enabled) }
+  private getter autoscaling_worker_node_pools : Array(Configuration::Models::WorkerNodePool) { settings.worker_node_pools.select(&.autoscaling_enabled) }
   private getter ssh_client : Util::SSH { Util::SSH.new(settings.networking.ssh.private_key_path, settings.networking.ssh.public_key_path) }
   private getter network : Hetzner::Network?
   private getter ssh_key : Hetzner::SSHKey

src/cluster/network_manager.cr

@@ -19,7 +19,7 @@ class Cluster::NetworkManager
       settings: settings,
       hetzner_client: hetzner_client,
       network_name: settings.cluster_name,
-      network_zone: ::Configuration::Settings::NodePool::Location.network_zone_by_location(default_masters_Location)
+      network_zone: ::Configuration::Validators::NodePoolConfig::Location.network_zone_by_location(default_masters_Location)
     ).run
   end
 

src/configuration/addons.cr

@@ -7,21 +7,36 @@ require "../hetzner/client"
 require "../hetzner/instance_type"
 require "../hetzner/location"
 
-require "./settings/configuration_file_path"
-require "./settings/cluster_name"
-require "./settings/kubeconfig_path"
-require "./settings/k3s_version"
-require "./settings/new_k3s_version"
-require "./networking"
-require "./settings/node_pool"
-require "./settings/node_pool/autoscaling"
-require "./settings/node_pool/pool_name"
-require "./settings/node_pool/instance_type"
-require "./settings/node_pool/location"
-require "./settings/node_pool/instance_count"
-require "./settings/node_pool/node_labels"
-require "./settings/node_pool/node_taints"
-require "./settings/datastore"
+require "./validators/configuration_file_path"
+require "./validators/cluster_name"
+require "./validators/kubeconfig_path"
+require "./validators/k3s_version"
+require "./validators/new_k3s_version"
+require "./models/networking"
+require "./validators/node_pool"
+require "./validators/node_pool_config/autoscaling"
+require "./validators/node_pool_config/pool_name"
+require "./validators/node_pool_config/instance_type"
+require "./validators/node_pool_config/location"
+require "./validators/node_pool_config/instance_count"
+require "./validators/node_pool_config/labels"
+require "./validators/node_pool_config/taints"
+require "./validators/datastore"
+require "./validators/networking_config/allowed_networks"
+require "./validators/networking_config/cni_config/cilium"
+require "./validators/networking_config/cni"
+require "./validators/networking_config/private_network"
+require "./validators/networking_config/public_network"
+require "./validators/networking_config/ssh"
+require "./validators/networking"
+require "./validators/worker_node_pools"
+require "./validators/masters_pool"
+require "./validators/kubectl_presence"
+require "./validators/helm_presence"
+require "./validators/create_settings"
+require "./validators/upgrade_settings"
+require "./validators/run_settings"
+require "./validators/command_specific_settings"
 require "../util"
 
 class Configuration::Loader
@@ -44,7 +59,7 @@ class Configuration::Loader
     Path[settings.kubeconfig_path].expand(home: true).to_s
   end
 
-  getter masters_pool : Configuration::MasterNodePool do
+  getter masters_pool : Configuration::Models::MasterNodePool do
     settings.masters_pool
   end
 
@@ -66,64 +81,32 @@ class Configuration::Loader
   def initialize(@configuration_file_path, @new_k3s_version, @force)
     @settings = Configuration::Main.from_yaml(File.read(configuration_file_path))
 
-    Settings::ConfigurationFilePath.new(errors, configuration_file_path).validate
+    Configuration::Validators::ConfigurationFilePath.new(errors, configuration_file_path).validate
 
     print_errors unless errors.empty?
   end
 
   def validate(command)
     log_line "Validating configuration..."
 
-    Settings::ClusterName.new(errors, settings.cluster_name).validate
+    Configuration::Validators::ClusterName.new(errors, settings.cluster_name).validate
 
     validate_command_specific_settings(command)
 
     print_validation_result
   end
 
   private def validate_command_specific_settings(command)
-    case command
-    when :create
-      validate_create_settings
-    when :delete
-    when :upgrade
-      validate_upgrade_settings
-    when :run
-      validate_run_settings
-    end
-  end
-
-  private def validate_create_settings
-    Settings::KubeconfigPath.new(errors, kubeconfig_path, file_must_exist: false).validate
-    Settings::K3sVersion.new(errors, settings.k3s_version).validate
-    Settings::Datastore.new(errors, settings.datastore).validate
-
-    settings.networking.validate(errors, settings, hetzner_client, settings.networking.private_network)
-
-    validate_masters_pool
-    validate_worker_node_pools
-
-    validate_kubectl_presence
-    validate_helm_presence
-  end
-
-  private def validate_run_settings
-    validate_kubectl_presence
-  end
-
-  private def validate_upgrade_settings
-    Settings::KubeconfigPath.new(errors, kubeconfig_path, file_must_exist: true).validate
-    Settings::NewK3sVersion.new(errors, settings.k3s_version, new_k3s_version).validate
-
-    validate_kubectl_presence
-  end
-
-  private def validate_kubectl_presence
-    errors << "kubectl is not installed or not in PATH" unless which("kubectl")
-  end
-
-  private def validate_helm_presence
-    errors << "helm is not installed or not in PATH" unless which("helm")
+    Configuration::Validators::CommandSpecificSettings.new(
+      errors: errors,
+      settings: settings,
+      kubeconfig_path: kubeconfig_path,
+      hetzner_client: hetzner_client,
+      masters_pool: masters_pool,
+      instance_types: instance_types,
+      all_locations: all_locations,
+      new_k3s_version: new_k3s_version
+    ).validate(command)
   end
 
   private def print_validation_result
@@ -135,42 +118,6 @@ class Configuration::Loader
     end
   end
 
-  private def validate_masters_pool
-    Settings::NodePool.new(
-      errors: errors,
-      pool: settings.masters_pool,
-      pool_type: :masters,
-      masters_pool: masters_pool,
-      instance_types: instance_types,
-      all_locations: all_locations,
-      datastore: settings.datastore
-    ).validate
-  end
-
-  private def validate_worker_node_pools
-    node_pools = settings.worker_node_pools || [] of Configuration::WorkerNodePool
-
-    if node_pools.empty? && !settings.schedule_workloads_on_masters
-      errors << "At least one worker node pool is required in order to schedule workloads"
-      return
-    end
-
-    names = node_pools.map(&.name)
-    errors << "Each worker node pool must have a unique name" if names.uniq.size != names.size
-
-    node_pools.each do |pool|
-      Settings::NodePool.new(
-        errors: errors,
-        pool: pool,
-        pool_type: :workers,
-        masters_pool: masters_pool,
-        instance_types: instance_types,
-        all_locations: all_locations,
-        datastore: settings.datastore
-      ).validate
-    end
-  end
-
   private def print_errors
     log_line "Some information in the configuration file requires your attention, aborting."
 

src/configuration/datastore.cr

@@ -1,13 +1,13 @@
 require "yaml"
 
-require "./master_node_pool"
-require "./worker_node_pool"
-require "./datastore"
-require "./manifests"
-require "./embedded_registry_mirror"
-require "./local_path_storage_class"
-require "./addons"
-require "./cluster_autoscaler"
+require "./models/master_node_pool"
+require "./models/worker_node_pool"
+require "./models/datastore"
+require "./models/manifests"
+require "./models/embedded_registry_mirror"
+require "./models/local_path_storage_class"
+require "./models/addons"
+require "./models/addons_config/cluster_autoscaler"
 
 class Configuration::Main
   include YAML::Serializable
@@ -18,8 +18,8 @@ class Configuration::Main
   getter k3s_version : String
   getter api_server_hostname : String?
   getter schedule_workloads_on_masters : Bool = false
-  getter masters_pool : Configuration::MasterNodePool
-  getter worker_node_pools : Array(Configuration::WorkerNodePool) = [] of Configuration::WorkerNodePool
+  getter masters_pool : Configuration::Models::MasterNodePool
+  getter worker_node_pools : Array(Configuration::Models::WorkerNodePool) = [] of Configuration::Models::WorkerNodePool
   getter additional_pre_k3s_commands : Array(String) = [] of String
   getter additional_post_k3s_commands : Array(String) = [] of String
   getter additional_packages : Array(String) = [] of String
@@ -33,13 +33,13 @@ class Configuration::Main
   getter image : String = "ubuntu-24.04"
   getter autoscaling_image : String?
   getter snapshot_os : String = "default"
-  getter networking : Configuration::Networking = Configuration::Networking.new
-  getter datastore : Configuration::Datastore = Configuration::Datastore.new
-  getter manifests : Configuration::Manifests = Configuration::Manifests.new
-  getter embedded_registry_mirror : Configuration::EmbeddedRegistryMirror = Configuration::EmbeddedRegistryMirror.new
-  getter local_path_storage_class : Configuration::LocalPathStorageClass = Configuration::LocalPathStorageClass.new
-  getter addons : Configuration::Addons = Configuration::Addons.new
-  getter cluster_autoscaler : Configuration::ClusterAutoscaler = Configuration::ClusterAutoscaler.new
+  getter networking : Configuration::Models::Networking = Configuration::Models::Networking.new
+  getter datastore : Configuration::Models::Datastore = Configuration::Models::Datastore.new
+  getter manifests : Configuration::Models::Manifests = Configuration::Models::Manifests.new
+  getter embedded_registry_mirror : Configuration::Models::EmbeddedRegistryMirror = Configuration::Models::EmbeddedRegistryMirror.new
+  getter local_path_storage_class : Configuration::Models::LocalPathStorageClass = Configuration::Models::LocalPathStorageClass.new
+  getter addons : Configuration::Models::Addons = Configuration::Models::Addons.new
+  getter cluster_autoscaler : Configuration::Models::AddonsConfig::ClusterAutoscaler = Configuration::Models::AddonsConfig::ClusterAutoscaler.new
   getter include_instance_type_in_instance_name : Bool = false
   getter protect_against_deletion : Bool = true
   getter create_load_balancer_for_the_kubernetes_api : Bool = false

src/configuration/loader.cr

@@ -0,0 +1,34 @@
+module Configuration
+  module Models
+    class Addons
+      include YAML::Serializable
+      include YAML::Serializable::Unmapped
+
+      # Generic toggle struct – can be extended later with more settings per addon
+      class Toggle
+        include YAML::Serializable
+        include YAML::Serializable::Unmapped
+
+        getter enabled : Bool
+
+        def initialize(@enabled : Bool = true)
+        end
+
+        def enabled?
+          enabled
+        end
+      end
+
+      # Addon definitions with sensible defaults (true unless specified otherwise)
+      getter csi_driver : Toggle = Toggle.new(true)
+      getter traefik : Toggle = Toggle.new(false)
+      getter servicelb : Toggle = Toggle.new(false)
+      getter metrics_server : Toggle = Toggle.new(false)
+      getter cloud_controller_manager : Toggle = Toggle.new(true)
+      getter cluster_autoscaler : Toggle = Toggle.new(true)
+
+      def initialize
+      end
+    end
+  end
+end

src/configuration/main.cr

@@ -1,6 +1,6 @@
 require "yaml"
 
-class Configuration::ClusterAutoscaler
+class Configuration::Models::AddonsConfig::ClusterAutoscaler
   include YAML::Serializable
 
   property scan_interval : String = "10s"
@@ -11,8 +11,4 @@ class Configuration::ClusterAutoscaler
 
   def initialize
   end
-
-  def initialize(pull : YAML::PullParser)
-    previous_def(pull)
-  end
 end