diff --git a/README.md b/README.md index d3b02b8..9b0802c 100644 --- a/README.md +++ b/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://.... diff --git a/cluster_config.yaml.example b/cluster_config.yaml.example index 8a476e9..d550465 100644 --- a/cluster_config.yaml.example +++ b/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://.... diff --git a/src/configuration/main.cr b/src/configuration/main.cr index a2b4e5d..9f73103 100644 --- a/src/configuration/main.cr +++ b/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 diff --git a/src/kubernetes/installer.cr b/src/kubernetes/installer.cr index 3bdb700..59e58fe 100644 --- a/src/kubernetes/installer.cr +++ b/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)