Skip to content

fix: tls install script not running on first boot #764

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
May 15, 2024
Merged

fix: tls install script not running on first boot #764

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
4 changes: 3 additions & 1 deletion svc/pkg/cluster/worker/src/workers/server_install/install_scripts/files/rivet_fetch_tls.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ EOF
cat << 'EOF' > /etc/systemd/system/rivet_fetch_tls.timer
[Unit]
Description=Runs TLS fetch every minute
Requires=network-online.target
After=network-online.target

[Timer]
OnBootSec=1
OnUnitInactiveSec=1h
Unit=rivet_fetch_tls.service

Expand All @@ -68,3 +69,4 @@ EOF
# Enable tls fetch script to run on reboot
systemctl daemon-reload
systemctl enable rivet_fetch_tls.timer
systemctl enable rivet_fetch_tls.service
36 changes: 16 additions & 20 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 @@ -5,21 +5,23 @@ use proto::backend;

pub mod components;

const TUNNEL_NAME: &str = "tunnel";
const GG_TRAEFIK_INSTANCE_NAME: &str = "game_guard";

// This script installs all of the software that doesn't need to know anything about the server running
// it (doesn't need to know server id, datacenter id, vlan ip, etc)
pub async fn gen_install(
pool_type: backend::cluster::PoolType,
initialize_immediately: bool,
server_token: &str,
) -> 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(tunnel_name)?,
components::traefik::tunnel(TUNNEL_NAME)?,
components::vector::install(),
];

Expand All @@ -34,7 +36,13 @@ pub async fn gen_install(
script.push(components::cni::plugins());
script.push(components::nomad::install());
}
backend::cluster::PoolType::Gg => {}
backend::cluster::PoolType::Gg => {
script.push(components::rivet::fetch_tls(
initialize_immediately,
server_token,
GG_TRAEFIK_INSTANCE_NAME,
)?);
}
backend::cluster::PoolType::Ats => {
script.push(components::docker::install());
script.push(components::traffic_server::install());
Expand All @@ -43,7 +51,7 @@ pub async fn gen_install(

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

Expand All @@ -61,11 +69,7 @@ pub async fn gen_hook(server_token: &str) -> GlobalResult<String> {

// This script is templated on the server itself after fetching server data from the Rivet API (see gen_hook).
// After being templated, it is run.
pub async fn gen_initialize(
pool_type: backend::cluster::PoolType,
initialize_immediately: bool,
server_token: &str,
) -> GlobalResult<String> {
pub async fn gen_initialize(pool_type: backend::cluster::PoolType) -> GlobalResult<String> {
let mut script = Vec::new();

let mut prometheus_targets = HashMap::new();
Expand Down Expand Up @@ -93,25 +97,17 @@ pub async fn gen_initialize(
);
}
backend::cluster::PoolType::Gg => {
let traefik_instance_name = "game_guard".to_string();

script.push(components::traefik::instance(
components::traefik::Instance {
name: traefik_instance_name.clone(),
name: GG_TRAEFIK_INSTANCE_NAME.to_string(),
static_config: components::traefik::gg_static_config().await?,
dynamic_config: String::new(),
tcp_server_transports: Default::default(),
},
));

script.push(components::rivet::fetch_tls(
initialize_immediately,
server_token,
&traefik_instance_name,
)?);

prometheus_targets.insert(
"game_guard".into(),
GG_TRAEFIK_INSTANCE_NAME.into(),
components::vector::PrometheusTarget {
endpoint: "http://127.0.0.1:9980/metrics".into(),
scrape_interval: 15,
Expand Down
6 changes: 2 additions & 4 deletions svc/pkg/cluster/worker/src/workers/server_install/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,9 @@ async fn worker(ctx: &OperationContext<cluster::msg::server_install::Message>) -
let server_token = &unwrap_ref!(token_res.token).token;

let install_script =
install_scripts::gen_install(pool_type, ctx.initialize_immediately).await?;
install_scripts::gen_install(pool_type, ctx.initialize_immediately, server_token).await?;
let hook_script = install_scripts::gen_hook(server_token).await?;
let initialize_script =
install_scripts::gen_initialize(pool_type, ctx.initialize_immediately, server_token)
.await?;
let initialize_script = install_scripts::gen_initialize(pool_type).await?;

// Spawn blocking thread for ssh (no async support)
tokio::task::spawn_blocking(move || {
Expand Down