Skip to content

Commit

Permalink
fix: fix tunnels (#1227)
Browse files Browse the repository at this point in the history
<!-- Please make sure there is an issue that this PR is correlated to. -->
**MERGE WITH https://app.graphite.dev/github/pr/rivet-gg/rivet-ee/176/fix-fix-tunnels**
## Changes

<!-- If there are frontend changes, please include screenshots. -->
  • Loading branch information
MasterPtato committed Oct 22, 2024
1 parent 46389aa commit 30fda93
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion infra/tf/k8s_infra/traefik.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ resource "helm_release" "traefik" {
} : null

additionalArguments = [
"--providers.http.endpoint=http://rivet-api-internal-monolith.rivet-service.svc.cluster.local/traefik-provider/config/core?token=${module.traefik_secrets.values["rivet/api_traefik_provider/token"]}",
"--providers.http.endpoint=http://rivet-api-internal.rivet-service.svc.cluster.local/traefik-provider/config/core?token=${module.traefik_secrets.values["rivet/api_traefik_provider/token"]}",
"--providers.http.pollInterval=2.5s",
# See docs/infrastructure/TIMEOUTS.md
"--entryPoints.web.transport.lifeCycle.graceTimeOut=60s",
Expand Down
4 changes: 2 additions & 2 deletions infra/tf/k8s_infra/traefik_tunnel.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ locals {
tunnel_services = merge(flatten([
var.edge_enabled ? [{
"api-internal" = {
service = "rivet-api-internal-monolith"
service = "rivet-api-internal"
service_namespace = kubernetes_namespace.rivet_service.metadata[0].name
service_port = 80
},
Expand Down Expand Up @@ -150,7 +150,7 @@ resource "helm_release" "traefik_tunnel" {
} : null

additionalArguments = [
"--providers.http.endpoint=http://rivet-api-internal-monolith.rivet-service.svc.cluster.local/traefik-provider/config/tunnel?token=${module.traefik_secrets.values["rivet/api_traefik_provider/token"]}",
"--providers.http.endpoint=http://rivet-api-internal.rivet-service.svc.cluster.local/traefik-provider/config/tunnel?token=${module.traefik_secrets.values["rivet/api_traefik_provider/token"]}",
"--providers.http.pollInterval=2.5s",
]

Expand Down
2 changes: 1 addition & 1 deletion svc/api/traefik-provider/tests/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const CDN_POLL_INTERVAL: Duration = Duration::from_millis(500);
static GLOBAL_INIT: Once = Once::new();

const API_TRAEFIK_PROVIDER_URL: &str =
"http://rivet-api-internal-monolith.rivet-service.svc.cluster.local/traefik-provider";
"http://rivet-api-internal.rivet-service.svc.cluster.local/traefik-provider";

async fn get_api_traefik_provider_token() -> String {
util::env::read_secret(&["rivet", "api_traefik_provider", "token"])
Expand Down

0 comments on commit 30fda93

Please sign in to comment.