407b33abd6
Phase 1 - OOM fixes: - dashy: increase memory limit 512Mi→1Gi (was at 99% utilization) - caretta DaemonSet: set explicit resources 300Mi/512Mi (was at 85-98%) - mysql-operator: add Helm resource values 256Mi/512Mi, create namespace with tier label (was at 92% of LimitRange default) - prowlarr, flaresolverr, annas-archive-stacks: add explicit resources (outgrowing 256Mi LimitRange defaults) - real-estate-crawler celery: add resources 512Mi/3Gi (608Mi actual, no explicit resources) Phase 2 - Close quota gaps: - nvidia, real-estate-crawler, trading-bot: remove custom-quota=true labels so Kyverno generates tier-appropriate quotas - descheduler: add tier=1-cluster label for proper classification Phase 3 - Reduce excessive quotas: - monitoring: limits.memory 240Gi→64Gi, limits.cpu 120→64 - woodpecker: limits.memory 128Gi→32Gi, limits.cpu 64→16 - GPU tier default: limits.memory 96Gi→32Gi, limits.cpu 48→16 Phase 4 - Kubelet protection: - Add cpu: 200m to systemReserved and kubeReserved in kubelet template Phase 5 - HA improvements: - cloudflared: add topology spread (ScheduleAnyway) + PDB (maxUnavailable:1) - grafana: add topology spread + PDB via Helm values - crowdsec LAPI: add topology spread + PDB via Helm values - authentik server: add topology spread via Helm values - authentik worker: add topology spread + PDB via Helm values
481 lines
12 KiB
HCL
481 lines
12 KiB
HCL
variable "tls_secret_name" {
|
|
type = string
|
|
sensitive = true
|
|
}
|
|
variable "realestate_crawler_db_password" {
|
|
type = string
|
|
sensitive = true
|
|
}
|
|
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
|
|
}
|
|
}
|
|
}
|
|
|
|
module "tls_secret" {
|
|
source = "../../modules/kubernetes/setup_tls_secret"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
module "nfs_data" {
|
|
source = "../../modules/kubernetes/nfs_volume"
|
|
name = "real-estate-crawler-data"
|
|
namespace = kubernetes_namespace.realestate-crawler.metadata[0].name
|
|
nfs_server = var.nfs_server
|
|
nfs_path = "/mnt/main/real-estate-crawler"
|
|
}
|
|
|
|
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"
|
|
persistent_volume_claim {
|
|
claim_name = module.nfs_data.claim_name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
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"
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "true"
|
|
"gethomepage.dev/name" = "Wrongmove"
|
|
"gethomepage.dev/description" = "Property search"
|
|
"gethomepage.dev/icon" = "home-assistant.png"
|
|
"gethomepage.dev/group" = "Other"
|
|
"gethomepage.dev/pod-selector" = ""
|
|
}
|
|
}
|
|
|
|
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
|
|
extra_annotations = {
|
|
"gethomepage.dev/enabled" = "false"
|
|
}
|
|
}
|
|
|
|
|
|
# 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"]
|
|
resources {
|
|
requests = {
|
|
cpu = "50m"
|
|
memory = "512Mi"
|
|
}
|
|
limits = {
|
|
cpu = "1"
|
|
memory = "3Gi"
|
|
}
|
|
}
|
|
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"
|
|
persistent_volume_claim {
|
|
claim_name = module.nfs_data.claim_name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
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"
|
|
persistent_volume_claim {
|
|
claim_name = module.nfs_data.claim_name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|