diff --git a/Cargo.lock b/Cargo.lock index adec76f..f9bf677 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -746,9 +746,9 @@ checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" [[package]] name = "hcloud" -version = "0.21.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b446f80cb00b49b795e423cdc013ee9d53f60ad9cc8bbcf94f27d7c2a2fdf" +checksum = "eea8b0f1d4a145dbfcd7eb4bab2902b354d2e860c131835075cc240a1ccb3a19" dependencies = [ "reqwest", "serde", diff --git a/Cargo.toml b/Cargo.toml index 276ca98..b527025 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ readme = "README.md" clap = { version = "4.5.21", features = ["derive", "env"] } dotenvy = "0.15.7" futures = "0.3.31" -hcloud = "0.21.0" +hcloud = "0.26.0" k8s-openapi = { version = "0.23.0", features = ["v1_31"] } kube = { version = "0.96.0", features = ["runtime"] } serde = { version = "1.0.229", features = ["derive"] } diff --git a/src/lb.rs b/src/lb.rs index 45fe771..88ae89e 100644 --- a/src/lb.rs +++ b/src/lb.rs @@ -221,7 +221,7 @@ impl LoadBalancer { &self.hcloud_config, UpdateServiceParams { id: hcloud_balancer.id, - body: Some(UpdateLoadBalancerService { + update_load_balancer_service: UpdateLoadBalancerService { http: None, protocol: Some(hcloud::models::update_load_balancer_service::Protocol::Tcp), listen_port: service.listen_port, @@ -237,7 +237,7 @@ impl LoadBalancer { timeout: Some(self.timeout), }, )), - }), + }, }, ) }) @@ -253,9 +253,9 @@ impl LoadBalancer { &self.hcloud_config, DeleteServiceParams { id: hcloud_balancer.id, - delete_service_request: Some(DeleteServiceRequest { + delete_service_request: DeleteServiceRequest { listen_port: service.listen_port, - }), + }, }, ) }) @@ -278,7 +278,7 @@ impl LoadBalancer { &self.hcloud_config, AddServiceParams { id: hcloud_balancer.id, - body: Some(LoadBalancerService { + load_balancer_service: LoadBalancerService { http: None, listen_port: *listen_port, destination_port: *destination_port, @@ -293,7 +293,7 @@ impl LoadBalancer { retries: self.retries, timeout: self.timeout, }), - }), + }, }, ) }) @@ -351,10 +351,10 @@ impl LoadBalancer { &self.hcloud_config, RemoveTargetParams { id: hcloud_balancer.id, - remove_target_request: Some(RemoveTargetRequest { + remove_target_request: RemoveTargetRequest { ip: Some(target_ip.clone()), ..Default::default() - }), + }, }, ) }) @@ -380,12 +380,12 @@ impl LoadBalancer { &self.hcloud_config, AddTargetParams { id: hcloud_balancer.id, - body: Some(LoadBalancerAddTarget { + load_balancer_add_target: LoadBalancerAddTarget { ip: Some(Box::new(hcloud::models::LoadBalancerTargetIp { ip: (*ip).to_string(), })), ..Default::default() - }), + }, }, ) }) @@ -447,7 +447,7 @@ impl LoadBalancer { &self.hcloud_config, ChangeAlgorithmParams { id: hcloud_balancer.id, - body: Some(self.algorithm.clone()), + body: self.algorithm.clone(), }, ) }) @@ -473,9 +473,9 @@ impl LoadBalancer { &self.hcloud_config, ChangeTypeOfLoadBalancerParams { id: hcloud_balancer.id, - change_type_of_load_balancer_request: Some(ChangeTypeOfLoadBalancerRequest { + change_type_of_load_balancer_request: ChangeTypeOfLoadBalancerRequest { load_balancer_type: self.balancer_type.clone(), - }), + }, }, ) }) @@ -528,11 +528,10 @@ impl LoadBalancer { &self.hcloud_config, DetachLoadBalancerFromNetworkParams { id: hcloud_balancer.id, - detach_load_balancer_from_network_request: Some( + detach_load_balancer_from_network_request: DetachLoadBalancerFromNetworkRequest { network: private_net_id, }, - ), }, ) }) @@ -549,12 +548,12 @@ impl LoadBalancer { &self.hcloud_config, AttachLoadBalancerToNetworkParams { id: hcloud_balancer.id, - attach_load_balancer_to_network_request: Some( + attach_load_balancer_to_network_request: AttachLoadBalancerToNetworkRequest { ip: self.private_ip.clone(), + ip_range: None, network: network_id, }, - ), }, ) }) @@ -580,9 +579,9 @@ impl LoadBalancer { &self.hcloud_config, DeleteServiceParams { id: hcloud_balancer.id, - delete_service_request: Some(DeleteServiceRequest { + delete_service_request: DeleteServiceRequest { listen_port: service.listen_port, - }), + }, }, ) .await?; @@ -594,10 +593,10 @@ impl LoadBalancer { &self.hcloud_config, RemoveTargetParams { id: hcloud_balancer.id, - remove_target_request: Some(RemoveTargetRequest { + remove_target_request: RemoveTargetRequest { ip: Some(target_ip), ..Default::default() - }), + }, }, ) .await?; @@ -655,7 +654,7 @@ impl LoadBalancer { let response = hcloud::apis::load_balancers_api::create_load_balancer( &self.hcloud_config, hcloud::apis::load_balancers_api::CreateLoadBalancerParams { - create_load_balancer_request: Some(hcloud::models::CreateLoadBalancerRequest { + create_load_balancer_request: hcloud::models::CreateLoadBalancerRequest { algorithm: Some(Box::new(self.algorithm.clone())), labels: None, load_balancer_type: self.balancer_type.clone(), @@ -666,7 +665,7 @@ impl LoadBalancer { public_interface: Some(true), services: Some(vec![]), targets: Some(vec![]), - }), + }, }, ) .await?;