Full cluster resource audit: cross-referenced Goldilocks VPA recommendations, live kubectl top metrics, and Terraform definitions for 100+ containers. Critical fixes: - dashy: CPU throttled at 98% (490m/500m) → 2 CPU limit - stirling-pdf: CPU throttled at 99.7% (299m/300m) → 2 CPU limit - traefik auth-proxy/bot-block-proxy: mem limit 32Mi → 128Mi Added explicit resources to ~40 containers that had none: - audiobookshelf, changedetection, cyberchef, dawarich, diun, echo, excalidraw, freshrss, hackmd, isponsorblocktv, linkwarden, n8n, navidrome, ntfy, owntracks, privatebin, send, shadowsocks, tandoor, tor-proxy, wealthfolio, networking-toolbox, rybbit, mailserver, cloudflared, pgadmin, phpmyadmin, crowdsec-web, xray, wireguard, k8s-portal, tuya-bridge, ollama-ui, whisper, piper, immich-server, immich-postgresql, osrm-foot GPU containers: added CPU/mem alongside GPU limits: - ollama: removed CPU/mem limits (models vary in size), keep GPU only - frigate: req 500m/2Gi, lim 4/8Gi + GPU - immich-ml: req 100m/1Gi, lim 2/4Gi + GPU Right-sized ~25 over-provisioned containers: - kms-web-page: 500m/512Mi → 50m/64Mi (was using 0m/10Mi) - onlyoffice: CPU 8 → 2 (VPA upper 45m) - realestate-crawler-api: CPU 2000m → 250m - blog/travel-blog/webhook-handler: 500m → 100m - coturn/health/plotting-book: reduced to match actual usage Conservative methodology: limits = max(VPA upper * 2, live usage * 2)
450 lines
11 KiB
HCL
450 lines
11 KiB
HCL
variable "tls_secret_name" { type = string }
|
|
variable "realestate_crawler_db_password" { type = string }
|
|
variable "realestate_crawler_notification_settings" { type = map(string) }
|
|
variable "nfs_server" { type = string }
|
|
variable "redis_host" { type = string }
|
|
variable "mysql_host" { type = string }
|
|
|
|
|
|
resource "kubernetes_namespace" "realestate-crawler" {
|
|
metadata {
|
|
name = "realestate-crawler"
|
|
labels = {
|
|
"istio-injection" : "disabled"
|
|
tier = local.tiers.aux
|
|
"resource-governance/custom-quota" = "true"
|
|
}
|
|
}
|
|
}
|
|
|
|
module "tls_secret" {
|
|
source = "../../modules/kubernetes/setup_tls_secret"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
resource "kubernetes_deployment" "realestate-crawler-ui" {
|
|
metadata {
|
|
name = "realestate-crawler-ui"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
app = "realestate-crawler-ui"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 2
|
|
strategy {
|
|
type = "RollingUpdate"
|
|
rolling_update {
|
|
max_unavailable = 0
|
|
max_surge = 1
|
|
}
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "realestate-crawler-ui"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "realestate-crawler-ui"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "realestate-crawler-ui"
|
|
image = "viktorbarzin/immoweb:latest"
|
|
port {
|
|
name = "http"
|
|
container_port = 8080
|
|
protocol = "TCP"
|
|
}
|
|
env {
|
|
name = "ENV"
|
|
value = "prod"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
ignore_changes = [
|
|
spec[0].template[0].spec[0].container[0].image
|
|
]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "realestate-crawler-ui" {
|
|
metadata {
|
|
name = "realestate-crawler-ui"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
"app" = "realestate-crawler-ui"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "realestate-crawler-ui"
|
|
}
|
|
port {
|
|
port = 80
|
|
target_port = 8080
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "realestate-crawler-api" {
|
|
metadata {
|
|
name = "realestate-crawler-api"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
app = "realestate-crawler-api"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 2
|
|
strategy {
|
|
type = "RollingUpdate"
|
|
rolling_update {
|
|
max_unavailable = 0
|
|
max_surge = 1
|
|
}
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "realestate-crawler-api"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "realestate-crawler-api"
|
|
"kubernetes.io/cluster-service" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "realestate-crawler-api"
|
|
image = "viktorbarzin/realestatecrawler:latest"
|
|
image_pull_policy = "Always"
|
|
env {
|
|
name = "ENV"
|
|
value = "prod"
|
|
}
|
|
env {
|
|
name = "DB_CONNECTION_STRING"
|
|
value = "mysql://wrongmove:${var.realestate_crawler_db_password}@${var.mysql_host}:3306/wrongmove"
|
|
|
|
}
|
|
# env {
|
|
# name = "HTTP_PROXY"
|
|
# value = "http://tor-proxy.tor-proxy:8118"
|
|
# }
|
|
# env {
|
|
# name = "HTTPS_PROXY"
|
|
# value = "http://tor-proxy.tor-proxy:8118"
|
|
# }
|
|
env {
|
|
name = "CELERY_BROKER_URL"
|
|
value = "redis://${var.redis_host}:6379/0"
|
|
}
|
|
env {
|
|
name = "CELERY_RESULT_BACKEND"
|
|
value = "redis://${var.redis_host}:6379/1"
|
|
}
|
|
|
|
env {
|
|
name = "UVICORN_LOG_LEVEL"
|
|
value = "debug"
|
|
}
|
|
env {
|
|
name = "OSRM_FOOT_URL"
|
|
value = "http://osrm-foot.osm-routing.svc.cluster.local:5000"
|
|
}
|
|
env {
|
|
name = "OSRM_BICYCLE_URL"
|
|
value = "http://osrm-bicycle.osm-routing.svc.cluster.local:5000"
|
|
}
|
|
env {
|
|
name = "OTP_URL"
|
|
value = "http://otp.osm-routing.svc.cluster.local:8080"
|
|
}
|
|
env {
|
|
name = "SLACK_WEBHOOK_URL"
|
|
value = var.realestate_crawler_notification_settings["slack"]
|
|
}
|
|
env {
|
|
name = "WEBAUTHN_RP_ID"
|
|
value = "wrongmove.viktorbarzin.me"
|
|
}
|
|
env {
|
|
name = "WEBAUTHN_ORIGIN"
|
|
value = "https://wrongmove.viktorbarzin.me"
|
|
}
|
|
port {
|
|
name = "http"
|
|
container_port = 5001
|
|
protocol = "TCP"
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "15m"
|
|
memory = "64Mi"
|
|
}
|
|
limits = {
|
|
cpu = "250m"
|
|
memory = "512Mi"
|
|
}
|
|
}
|
|
volume_mount {
|
|
name = "data"
|
|
mount_path = "/app/data"
|
|
}
|
|
}
|
|
volume {
|
|
name = "data"
|
|
nfs {
|
|
path = "/mnt/main/real-estate-crawler"
|
|
server = var.nfs_server
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
lifecycle {
|
|
ignore_changes = [
|
|
spec[0].template[0].spec[0].container[0].image
|
|
]
|
|
}
|
|
}
|
|
resource "kubernetes_service" "realestate-crawler-api" {
|
|
metadata {
|
|
name = "realestate-crawler-api"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
"app" = "realestate-crawler-api"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "realestate-crawler-api"
|
|
}
|
|
port {
|
|
port = 80
|
|
target_port = 5001
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
name = "wrongmove"
|
|
service_name = "realestate-crawler-ui"
|
|
tls_secret_name = var.tls_secret_name
|
|
rybbit_site_id = "edee05de453d"
|
|
}
|
|
|
|
module "ingress-api" {
|
|
source = "../../modules/kubernetes/ingress_factory"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
name = "wrongmove-api"
|
|
host = "wrongmove"
|
|
service_name = "realestate-crawler-api"
|
|
ingress_path = ["/api"]
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
|
|
# Celery worker for background task processing
|
|
resource "kubernetes_deployment" "realestate-crawler-celery" {
|
|
metadata {
|
|
name = "realestate-crawler-celery"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
app = "realestate-crawler-celery"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "RollingUpdate"
|
|
rolling_update {
|
|
max_unavailable = 0
|
|
max_surge = 1
|
|
}
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "realestate-crawler-celery"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "realestate-crawler-celery"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "celery-worker"
|
|
image = "viktorbarzin/realestatecrawler:latest"
|
|
image_pull_policy = "Always"
|
|
command = ["python", "-m", "celery", "-A", "celery_app", "worker", "--loglevel=info", "--pool=threads"]
|
|
port {
|
|
name = "metrics"
|
|
container_port = 9090
|
|
protocol = "TCP"
|
|
}
|
|
env {
|
|
name = "ENV"
|
|
value = "prod"
|
|
}
|
|
env {
|
|
name = "DB_CONNECTION_STRING"
|
|
value = "mysql://wrongmove:${var.realestate_crawler_db_password}@${var.mysql_host}:3306/wrongmove"
|
|
}
|
|
env {
|
|
name = "CELERY_BROKER_URL"
|
|
value = "redis://${var.redis_host}:6379/0"
|
|
}
|
|
env {
|
|
name = "CELERY_RESULT_BACKEND"
|
|
value = "redis://${var.redis_host}:6379/1"
|
|
}
|
|
env {
|
|
name = "SLACK_WEBHOOK_URL"
|
|
value = lookup(var.realestate_crawler_notification_settings, "slack", "")
|
|
}
|
|
env {
|
|
name = "OSRM_FOOT_URL"
|
|
value = "http://osrm-foot.osm-routing.svc.cluster.local:5000"
|
|
}
|
|
env {
|
|
name = "OSRM_BICYCLE_URL"
|
|
value = "http://osrm-bicycle.osm-routing.svc.cluster.local:5000"
|
|
}
|
|
env {
|
|
name = "OTP_URL"
|
|
value = "http://otp.osm-routing.svc.cluster.local:8080"
|
|
}
|
|
volume_mount {
|
|
name = "data"
|
|
mount_path = "/app/data"
|
|
}
|
|
}
|
|
volume {
|
|
name = "data"
|
|
nfs {
|
|
path = "/mnt/main/real-estate-crawler"
|
|
server = var.nfs_server
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "realestate-crawler-celery-metrics" {
|
|
metadata {
|
|
name = "realestate-crawler-celery-metrics"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
"app" = "realestate-crawler-celery"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "realestate-crawler-celery"
|
|
}
|
|
port {
|
|
port = 9090
|
|
target_port = 9090
|
|
}
|
|
}
|
|
}
|
|
|
|
# Celery beat for scheduled task management
|
|
resource "kubernetes_deployment" "realestate-crawler-celery-beat" {
|
|
metadata {
|
|
name = "realestate-crawler-celery-beat"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
labels = {
|
|
app = "realestate-crawler-celery-beat"
|
|
tier = local.tiers.aux
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate" # Only one beat instance should run at a time
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "realestate-crawler-celery-beat"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "realestate-crawler-celery-beat"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
name = "celery-beat"
|
|
image = "viktorbarzin/realestatecrawler:latest"
|
|
command = ["python", "-m", "celery", "-A", "celery_app", "beat", "--loglevel=info"]
|
|
resources {
|
|
requests = {
|
|
cpu = "10m"
|
|
memory = "64Mi"
|
|
}
|
|
limits = {
|
|
cpu = "100m"
|
|
memory = "256Mi"
|
|
}
|
|
}
|
|
env {
|
|
name = "ENV"
|
|
value = "prod"
|
|
}
|
|
env {
|
|
name = "DB_CONNECTION_STRING"
|
|
value = "mysql://wrongmove:${var.realestate_crawler_db_password}@${var.mysql_host}:3306/wrongmove"
|
|
}
|
|
env {
|
|
name = "CELERY_BROKER_URL"
|
|
value = "redis://${var.redis_host}:6379/0"
|
|
}
|
|
env {
|
|
name = "CELERY_RESULT_BACKEND"
|
|
value = "redis://${var.redis_host}:6379/1"
|
|
}
|
|
env {
|
|
name = "SCRAPE_SCHEDULES"
|
|
value = lookup(var.realestate_crawler_notification_settings, "scrape_schedules", "")
|
|
}
|
|
volume_mount {
|
|
name = "data"
|
|
mount_path = "/app/data"
|
|
}
|
|
}
|
|
volume {
|
|
name = "data"
|
|
nfs {
|
|
path = "/mnt/main/real-estate-crawler"
|
|
server = var.nfs_server
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|