Skip to content

Commit

Permalink
Fix installation of the System Upgrade Controller
Browse files Browse the repository at this point in the history
  • Loading branch information
vitobotta committed Apr 12, 2024
1 parent bf79334 commit 79b9f3f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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://....
Expand Down
3 changes: 1 addition & 2 deletions cluster_config.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -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://....
Expand Down
3 changes: 1 addition & 2 deletions src/configuration/main.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/kubernetes/installer.cr
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 79b9f3f

Please sign in to comment.