Increase requests for under-requested pods (dashy 50m→250m, frigate 500m→1500m, clickhouse 100m→500m, otp 100m→300m, linkwarden 25m→50m, authentik worker 50m→100m). Reduce requests for over-requested pods (crowdsec agent/lapi 500m→25m each, prometheus 200m→100m, dbaas mysql 1800m→100m, pg-cluster 250m→50m, shlink-web 250m→10m, gpu-pod-exporter 50m→10m, stirling-pdf 100m→25m, technitium 100m→25m, celery 50m→15m). Reduce crowdsec quota from 8→1 CPU. Remove missed CPU limits in prometheus (cpu: "2") and dbaas (cpu: "3600m") tpl files.
293 lines
6.2 KiB
HCL
293 lines
6.2 KiB
HCL
variable "tls_secret_name" {
|
|
type = string
|
|
sensitive = true
|
|
}
|
|
variable "nfs_server" { type = string }
|
|
|
|
|
|
resource "kubernetes_namespace" "osm-routing" {
|
|
metadata {
|
|
name = "osm-routing"
|
|
labels = {
|
|
"istio-injection" : "disabled"
|
|
tier = local.tiers.aux
|
|
"resource-governance/custom-quota" = "true"
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_resource_quota_v1" "osm_routing" {
|
|
metadata {
|
|
name = "tier-quota"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
}
|
|
spec {
|
|
hard = {
|
|
"requests.cpu" = "4"
|
|
"requests.memory" = "6Gi"
|
|
"limits.cpu" = "16"
|
|
"limits.memory" = "16Gi"
|
|
pods = "20"
|
|
}
|
|
}
|
|
}
|
|
|
|
module "nfs_osrm_data" {
|
|
source = "../../modules/kubernetes/nfs_volume"
|
|
name = "osm-routing-osrm-data"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
nfs_server = var.nfs_server
|
|
nfs_path = "/mnt/main/osm-routing/osrm-data"
|
|
}
|
|
|
|
module "nfs_otp_data" {
|
|
source = "../../modules/kubernetes/nfs_volume"
|
|
name = "osm-routing-otp-data"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
nfs_server = var.nfs_server
|
|
nfs_path = "/mnt/main/osm-routing/otp-data"
|
|
}
|
|
|
|
# --- OSRM Foot ---
|
|
resource "kubernetes_deployment" "osrm-foot" {
|
|
metadata {
|
|
name = "osrm-foot"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
labels = {
|
|
app = "osrm-foot"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate"
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "osrm-foot"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "osrm-foot"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "osrm-foot"
|
|
image = "ghcr.io/project-osrm/osrm-backend:latest"
|
|
command = ["osrm-routed", "--algorithm", "MLD", "/data/foot/greater-london-latest.osrm"]
|
|
port {
|
|
name = "http"
|
|
container_port = 5000
|
|
protocol = "TCP"
|
|
}
|
|
volume_mount {
|
|
name = "osrm-data"
|
|
mount_path = "/data"
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "15m"
|
|
memory = "256Mi"
|
|
}
|
|
limits = {
|
|
memory = "1Gi"
|
|
}
|
|
}
|
|
}
|
|
volume {
|
|
name = "osrm-data"
|
|
persistent_volume_claim {
|
|
claim_name = module.nfs_osrm_data.claim_name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "osrm-foot" {
|
|
metadata {
|
|
name = "osrm-foot"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
labels = {
|
|
app = "osrm-foot"
|
|
}
|
|
}
|
|
spec {
|
|
selector = {
|
|
app = "osrm-foot"
|
|
}
|
|
port {
|
|
port = 5000
|
|
target_port = 5000
|
|
}
|
|
}
|
|
}
|
|
|
|
# --- OSRM Bicycle ---
|
|
resource "kubernetes_deployment" "osrm-bicycle" {
|
|
metadata {
|
|
name = "osrm-bicycle"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
labels = {
|
|
app = "osrm-bicycle"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate"
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "osrm-bicycle"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "osrm-bicycle"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "osrm-bicycle"
|
|
image = "ghcr.io/project-osrm/osrm-backend:latest"
|
|
command = ["osrm-routed", "--algorithm", "MLD", "/data/bicycle/greater-london-latest.osrm"]
|
|
port {
|
|
name = "http"
|
|
container_port = 5000
|
|
protocol = "TCP"
|
|
}
|
|
volume_mount {
|
|
name = "osrm-data"
|
|
mount_path = "/data"
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "15m"
|
|
memory = "256Mi"
|
|
}
|
|
limits = {
|
|
memory = "1Gi"
|
|
}
|
|
}
|
|
}
|
|
volume {
|
|
name = "osrm-data"
|
|
persistent_volume_claim {
|
|
claim_name = module.nfs_osrm_data.claim_name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "osrm-bicycle" {
|
|
metadata {
|
|
name = "osrm-bicycle"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
labels = {
|
|
app = "osrm-bicycle"
|
|
}
|
|
}
|
|
spec {
|
|
selector = {
|
|
app = "osrm-bicycle"
|
|
}
|
|
port {
|
|
port = 5000
|
|
target_port = 5000
|
|
}
|
|
}
|
|
}
|
|
|
|
# --- OTP (OpenTripPlanner) ---
|
|
resource "kubernetes_deployment" "otp" {
|
|
metadata {
|
|
name = "otp"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
labels = {
|
|
app = "otp"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate"
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "otp"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "otp"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "otp"
|
|
image = "opentripplanner/opentripplanner:2.6.0"
|
|
args = ["--build", "--save"]
|
|
port {
|
|
name = "http"
|
|
container_port = 8080
|
|
protocol = "TCP"
|
|
}
|
|
volume_mount {
|
|
name = "otp-data"
|
|
mount_path = "/var/opentripplanner"
|
|
}
|
|
env {
|
|
name = "JAVA_TOOL_OPTIONS"
|
|
value = "-Xmx3g"
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "300m"
|
|
memory = "2Gi"
|
|
}
|
|
limits = {
|
|
memory = "4Gi"
|
|
}
|
|
}
|
|
}
|
|
volume {
|
|
name = "otp-data"
|
|
persistent_volume_claim {
|
|
claim_name = module.nfs_otp_data.claim_name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "otp" {
|
|
metadata {
|
|
name = "otp"
|
|
namespace = kubernetes_namespace.osm-routing.metadata[0].name
|
|
labels = {
|
|
app = "otp"
|
|
}
|
|
}
|
|
spec {
|
|
selector = {
|
|
app = "otp"
|
|
}
|
|
port {
|
|
port = 8080
|
|
target_port = 8080
|
|
}
|
|
}
|
|
}
|