Skip to content
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

Jump to bottom

fix(infra): pass dynamic tunnel host port to cluster-server-install #980

Open
wants to merge 1 commit into
base: 07-02-fix_infra_re-run_sshd_config_if_dev_tunnel_machine_recreated
Choose a base branch
from
+17 −7
Open

fix(infra): pass dynamic tunnel host port to cluster-server-install #980

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
14 changes: 14 additions & 0 deletions lib/bolt/core/src/context/project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,20 @@ impl ProjectContextData {
}
}

pub async fn host_tunnel(self: &Arc<Self>) -> String {
let k8s_infra = terraform::output::read_k8s_infra(self).await;

let tunnel_port = if let config::ns::ClusterKind::SingleNode { tunnel_port, .. } =
&self.ns().cluster.kind
{
*tunnel_port
} else {
5000
};

format!("{}:{tunnel_port}", *k8s_infra.traefik_tunnel_external_ip)
}

/// Origin used for building links to the API endpoint.
pub fn origin_api(&self) -> String {
if let Some(domain_main_api) = self.domain_main_api() {
Expand Down
4 changes: 0 additions & 4 deletions lib/bolt/core/src/context/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,10 +1320,6 @@ impl ServiceContextData {
"TLS_ROOT_CA_CERT_PEM".into(),
(*tls.root_ca_cert_pem).clone(),
);
env.insert(
"K8S_TRAEFIK_TUNNEL_EXTERNAL_IP".into(),
(*k8s_infra.traefik_tunnel_external_ip).clone(),
);
MasterPtato marked this conversation as resolved.
Show resolved Hide resolved
// }

Ok(env)
Expand Down
6 changes: 3 additions & 3 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 @@ -168,7 +168,7 @@ pub fn tunnel(name: &str) -> GlobalResult<String> {
Ok(instance(Instance {
name: name.to_string(),
static_config: tunnel_static_config(),
dynamic_config: tunnel_dynamic_config(&util::env::var("K8S_TRAEFIK_TUNNEL_EXTERNAL_IP")?),
dynamic_config: tunnel_dynamic_config(&util::env::var("RIVET_HOST_TUNNEL")?),
tcp_server_transports,
}))
}
Expand All @@ -194,7 +194,7 @@ fn tunnel_static_config() -> String {
config
}

fn tunnel_dynamic_config(tunnel_external_ip: &str) -> String {
fn tunnel_dynamic_config(host_tunnel: &str) -> String {
let mut config = String::new();
for TunnelService { name, .. } in TUNNEL_SERVICES.iter() {
config.push_str(&formatdoc!(
Expand All @@ -208,7 +208,7 @@ fn tunnel_dynamic_config(tunnel_external_ip: &str) -> String {
serversTransport = "{name}"
[[tcp.services.{name}.loadBalancer.servers]]
address = "{tunnel_external_ip}:5000"
address = "{host_tunnel}"
tls = true
"#
))
Expand Down
Loading