Skip to content

fix: require tunnel before rivet hook #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2024
Merged

fix: require tunnel before rivet hook #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions svc/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions svc/pkg/cluster/worker/src/workers/server_destroy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ async fn inner(
)
.await?;
if server.provider_server_id.is_none() && !ctx.force {
// Check for stale message
if ctx.req_dt() > util::duration::hours(1) {
tracing::warn!("discarding stale message");
return Ok(());
}

bail!("server is not completely provisioned yet, retrying");
}

Expand Down
5 changes: 3 additions & 2 deletions svc/pkg/cluster/worker/src/workers/server_install/install_scripts/components/rivet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ use chirp_worker::prelude::*;

use super::TUNNEL_API_INTERNAL_PORT;

pub fn create_hook(initialize_immediately: bool) -> GlobalResult<String> {
let mut script = include_str!("../files/rivet_create_hook.sh").to_string();
pub fn create_hook(tunnel_name: &str, initialize_immediately: bool) -> GlobalResult<String> {
let mut script =
include_str!("../files/rivet_create_hook.sh").replace("__TUNNEL_NAME__", tunnel_name);

if initialize_immediately {
script.push_str("systemctl start rivet_hook\n");
Expand Down
4 changes: 2 additions & 2 deletions svc/pkg/cluster/worker/src/workers/server_install/install_scripts/components/traefik.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ pub fn instance(config: Instance) -> String {
script
}

pub fn tunnel() -> GlobalResult<String> {
pub fn tunnel(name: &str) -> GlobalResult<String> {
// Build transports for each service
let mut tcp_server_transports = HashMap::new();
for TunnelService { name, .. } in TUNNEL_SERVICES {
Expand All @@ -165,7 +165,7 @@ pub fn tunnel() -> GlobalResult<String> {
}

Ok(instance(Instance {
name: "tunnel".into(),
name: name.to_string(),
static_config: tunnel_static_config(),
dynamic_config: tunnel_dynamic_config(&util::env::var("K8S_TRAEFIK_TUNNEL_EXTERNAL_IP")?),
tcp_server_transports,
Expand Down
4 changes: 2 additions & 2 deletions svc/pkg/cluster/worker/src/workers/server_install/install_scripts/files/rivet_create_hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
cat << 'EOF' > /etc/systemd/system/rivet_hook.service
[Unit]
Description=Rivet Hook
Requires=network-online.target
After=network-online.target
Requires=network-online.target __TUNNEL_NAME__.service
After=network-online.target __TUNNEL_NAME__.service
ConditionPathExists=!/var/tmp/rivet_hook.completed

[Service]
Expand Down
9 changes: 7 additions & 2 deletions svc/pkg/cluster/worker/src/workers/server_install/install_scripts/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ pub async fn gen_install(
pool_type: backend::cluster::PoolType,
initialize_immediately: bool,
) -> GlobalResult<String> {
let tunnel_name = "tunnel";

// MARK: Common (pre)
let mut script = vec![
components::common(),
components::node_exporter::install(),
components::sysctl::install(),
components::traefik::install(),
components::traefik::tunnel()?,
components::traefik::tunnel(tunnel_name)?,
components::vector::install(),
];

Expand All @@ -40,7 +42,10 @@ pub async fn gen_install(
}

// MARK: Common (post)
script.push(components::rivet::create_hook(initialize_immediately)?);
script.push(components::rivet::create_hook(
tunnel_name,
initialize_immediately,
)?);

let joined = script.join("\n\necho \"======\"\n\n");
Ok(format!("#!/usr/bin/env bash\nset -eu\n\n{joined}"))
Expand Down