Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 24 additions & 24 deletions lib/bolt/core/src/context/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1272,31 +1272,31 @@ impl ServiceContextData {
}
}

if self.depends_on_infra() && project_ctx.ns().rivet.provisioning.is_some() {
let tls = terraform::output::read_tls(&project_ctx).await;
let k8s_infra = terraform::output::read_k8s_infra(&project_ctx).await;
// if self.depends_on_infra() && project_ctx.ns().rivet.provisioning.is_some() {
let tls = terraform::output::read_tls(&project_ctx).await;
let k8s_infra = terraform::output::read_k8s_infra(&project_ctx).await;

env.insert(
"TLS_CERT_LOCALLY_SIGNED_JOB_CERT_PEM".into(),
tls.tls_cert_locally_signed_job.cert_pem.clone(),
);
env.insert(
"TLS_CERT_LOCALLY_SIGNED_JOB_KEY_PEM".into(),
tls.tls_cert_locally_signed_job.key_pem.clone(),
);
env.insert(
"TLS_ACME_ACCOUNT_PRIVATE_KEY_PEM".into(),
(*tls.acme_account_private_key_pem).clone(),
);
env.insert(
"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(),
);
}
env.insert(
"TLS_CERT_LOCALLY_SIGNED_JOB_CERT_PEM".into(),
tls.tls_cert_locally_signed_job.cert_pem.clone(),
);
env.insert(
"TLS_CERT_LOCALLY_SIGNED_JOB_KEY_PEM".into(),
tls.tls_cert_locally_signed_job.key_pem.clone(),
);
env.insert(
"TLS_ACME_ACCOUNT_PRIVATE_KEY_PEM".into(),
(*tls.acme_account_private_key_pem).clone(),
);
env.insert(
"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(),
);
// }

Ok(env)
}
Expand Down
41 changes: 41 additions & 0 deletions svc/Cargo.lock

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

1 change: 1 addition & 0 deletions svc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ members = [
"pkg/cluster/ops/server-resolve-for-ip",
"pkg/cluster/standalone/datacenter-tls-renew",
"pkg/cluster/standalone/default-update",
"pkg/cluster/standalone/fix-tls",
"pkg/cluster/standalone/gc",
"pkg/cluster/standalone/metrics-publish",
"pkg/cluster/worker",
Expand Down
47 changes: 47 additions & 0 deletions svc/pkg/cluster/standalone/fix-tls/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[package]
name = "cluster-fix-tls"
version = "0.0.1"
edition = "2021"
authors = ["Rivet Gaming, LLC <developer@rivet.gg>"]
license = "Apache-2.0"

[dependencies]
chirp-client = { path = "../../../../../lib/chirp/client" }
rivet-operation = { path = "../../../../../lib/operation/core" }
rivet-connection = { path = "../../../../../lib/connection" }
rivet-runtime = { path = "../../../../../lib/runtime" }
tokio = { version = "1.29", features = ["full"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "json", "ansi"] }

acme-lib = "0.9"
anyhow = "1.0"
chrono = "0.4"
cloudflare = "0.10.1"
http = "0.2"
include_dir = "0.7.3"
indoc = "1.0"
lazy_static = "1.4"
maplit = "1.0"
nomad-util = { path = "../../../../../lib/nomad-util" }
openssl = "0.10.63"
rivet-convert = { path = "../../../../../lib/convert" }
rivet-health-checks = { path = "../../../../../lib/health-checks" }
rivet-metrics = { path = "../../../../../lib/metrics" }
s3-util = { path = "../../../../../lib/s3-util" }
serde_yaml = "0.9"
ssh2 = "0.9.4"
thiserror = "1.0"
trust-dns-resolver = { version = "0.23.2", features = ["dns-over-native-tls"] }
util-cluster = { package = "rivet-util-cluster", path = "../../util" }

cluster-datacenter-get = { path = "../../ops/datacenter-get" }
cluster-datacenter-list = { path = "../../ops/datacenter-list" }
cluster-datacenter-topology-get = { path = "../../ops/datacenter-topology-get" }
linode-instance-type-get = { path = "../../../linode/ops/instance-type-get" }
linode-server-destroy = { path = "../../../linode/ops/server-destroy" }
linode-server-provision = { path = "../../../linode/ops/server-provision" }
token-create = { path = "../../../token/ops/create" }

[dev-dependencies]
chirp-worker = { path = "../../../../../lib/chirp/worker" }
13 changes: 13 additions & 0 deletions svc/pkg/cluster/standalone/fix-tls/Service.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[service]
name = "cluster-fix-tls"

[runtime]
kind = "rust"

[secrets]
"rivet/api_traefik_provider/token" = {}
"cloudflare/terraform/auth_token" = { optional = true }
"ssh/server/private_key_openssh" = {}

[headless]
singleton = true
Loading