Merge pull request #338 from vitobotta:fix-system-upgrade-controller

Fix installation of the System Upgrade Controller

README.md

@@ -159,8 +159,7 @@ schedule_workloads_on_masters: false
 # snapshot_os: microos # optional: specified the os type when using a custom snapshot
 # cloud_controller_manager_manifest_url: "https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/v1.19.0/ccm-networks.yaml"
 # csi_driver_manifest_url: "https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.6.0/deploy/kubernetes/hcloud-csi.yml"
-# system_upgrade_controller_config_manifest_url: "https://github.com/rancher/system-upgrade-controller/releases/latest/download/system-upgrade-controller.yaml"
-# system_upgrade_controller_crd_manifest_url: "https://github.com/rancher/system-upgrade-controller/releases/latest/download/crd.yaml"
+# system_upgrade_controller_manifest_url: "https://github.com/rancher/system-upgrade-controller/releases/download/v0.4.0/system-upgrade-controller.yaml"
 datastore:
   mode: etcd # etcd (default) or external
   external_datastore_endpoint: postgres://....

cluster_config.yaml.example

@@ -24,8 +24,7 @@ disable_flannel: false # set to true if you want to install a different CNI
 # snapshot_os: microos # optional: specified the os type when using a custom snapshot
 # cloud_controller_manager_manifest_url: "https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/v1.19.0/ccm-networks.yaml"
 # csi_driver_manifest_url: "https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.6.0/deploy/kubernetes/hcloud-csi.yml"
-# system_upgrade_controller_config_manifest_url: "https://github.com/rancher/system-upgrade-controller/releases/latest/download/system-upgrade-controller.yaml"
-# system_upgrade_controller_crd_manifest_url: "https://github.com/rancher/system-upgrade-controller/releases/latest/download/crd.yaml"
+# system_upgrade_controller_manifest_url: "https://github.com/rancher/system-upgrade-controller/releases/download/v0.4.0/system-upgrade-controller.yaml"
 datastore:
   mode: etcd # etcd (default) or external
   external_datastore_endpoint: postgres://....

src/configuration/main.cr

@@ -41,8 +41,7 @@ class Configuration::Main
   getter cluster_dns : String = "10.43.0.10"
   getter cloud_controller_manager_manifest_url : String = "https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/v1.19.0/ccm-networks.yaml"
   getter csi_driver_manifest_url : String = "https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.6.0/deploy/kubernetes/hcloud-csi.yml"
-  getter system_upgrade_controller_config_manifest_url : String = "https://github.com/rancher/system-upgrade-controller/releases/latest/download/system-upgrade-controller.yaml"
-  getter system_upgrade_controller_crd_manifest_url : String = "https://github.com/rancher/system-upgrade-controller/releases/latest/download/crd.yaml"
+  getter system_upgrade_controller_manifest_url : String = "https://github.com/rancher/system-upgrade-controller/releases/download/v0.4.0/system-upgrade-controller.yaml"
   getter disable_flannel : Bool = false
   getter ssh_port : Int32 = 22
   getter datastore : Configuration::Datastore = Configuration::Datastore.new

src/kubernetes/installer.cr

@@ -300,7 +300,7 @@ class Kubernetes::Installer
     puts "\nDeploying k3s System Upgrade Controller..."
 
     # Run second manifest twice to fix problem with namespace creation
-    command = "kubectl apply -f #{settings.system_upgrade_controller_config_manifest_url},#{settings.system_upgrade_controller_crd_manifest_url},#{settings.system_upgrade_controller_crd_manifest_url}"
+    command = "kubectl apply -f #{settings.system_upgrade_controller_manifest_url}"
 
     result = Util::Shell.run(command, configuration.kubeconfig_path, settings.hetzner_token)