Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

NLnet task 3 #667

Merged
lx merged 60 commits from nlnet-task3 into next-0.10 2024-01-11 10:58:08 +00:00
Conversation 1 Commits 60 Files changed 41 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 431b28e0cf - Show all commits

4
src/rpc/system.rs
View file

@ -514,7 +514,7 @@ impl System {
if let Err(e) = c if let Err(e) = c
.publish_consul_service( .publish_consul_service(
self.netapp.id, self.netapp.id,
&self.local_status.load_full().hostname, &self.local_status.load_full().hostname.as_deref().unwrap(),
rpc_public_addr, rpc_public_addr,
) )
.await .await
@ -541,7 +541,7 @@ impl System {
if let Err(e) = publish_kubernetes_node( if let Err(e) = publish_kubernetes_node(
k, k,
self.netapp.id, self.netapp.id,
&self.local_status.load_full().hostname, &self.local_status.load_full().hostname.as_deref().unwrap(),
rpc_public_addr, rpc_public_addr,
) )
.await .await