Merge branch 'main' of github.com:vitobotta/hetzner-k3s

README.md

@@ -193,6 +193,7 @@ worker_node_pools:
 # kube_proxy_args:
 # - arg1
 # - ...
+# api_server_hostname: k8s.example.com # optional: DNS for the k8s API LoadBalancer. After the script has run, create a DNS record with the address of the API LoadBalancer. 
 ```
 
 Most settings should be self explanatory; you can run `hetzner-k3s releases` to see a list of the available k3s releases.

src/configuration/main.cr

@@ -14,6 +14,7 @@ class Configuration::Main
   getter use_ssh_agent : Bool = false
   getter ssh_allowed_networks : Array(String) = [] of String
   getter api_allowed_networks : Array(String) = [] of String
+  getter api_server_hostname : String?
   getter enable_public_net_ipv4 : Bool = true
   getter enable_public_net_ipv6 : Bool = true
   getter verify_host_key : Bool = false

src/hetzner/load_balancer.cr

@@ -6,9 +6,14 @@ class Hetzner::LoadBalancer
 
   property id : Int32
   property name : String
+  property private_net : Array(Hetzner::Ipv4)
   getter public_net : PublicNet?
-
+  
   def public_ip_address
     public_net.try(&.ipv4).try(&.ip)
   end
+
+  def private_ip_address
+    private_net[0].try(&.ip)
+  end
 end

src/kubernetes/installer.cr

@@ -201,7 +201,7 @@ class Kubernetes::Installer
     puts "Saving the kubeconfig file to #{kubeconfig_path}..."
 
     kubeconfig = ssh.run(first_master, settings.ssh_port, "cat /etc/rancher/k3s/k3s.yaml", settings.use_ssh_agent, print_output: false).
-      gsub("127.0.0.1", api_server_ip_address).
+      gsub("127.0.0.1",  settings.api_server_hostname ? settings.api_server_hostname : api_server_ip_address).
       gsub("default", settings.cluster_name)
 
     File.write(kubeconfig_path, kubeconfig)
@@ -360,6 +360,9 @@ class Kubernetes::Installer
 
   private def generate_tls_sans
     sans = ["--tls-san=#{api_server_ip_address}"]
+    sans << "--tls-san=#{settings.api_server_hostname}" if settings.api_server_hostname
+    sans << "--tls-san=#{load_balancer.not_nil!.private_ip_address}" if masters.size > 1
+
     masters.each do |master|
       master_private_ip = master.private_ip_address
       sans << "--tls-san=#{master_private_ip}"

templates/cluster_autoscaler.yaml

@@ -155,7 +155,7 @@ spec:
                   - key: node-role.kubernetes.io/master
                     operator: Exists
       containers:
-        - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.3
+        - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.3
           name: cluster-autoscaler
           resources:
             limits: