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)
237 lines
5.3 KiB
HCL
237 lines
5.3 KiB
HCL
variable "tls_secret_name" {}
|
|
variable "tier" { type = string }
|
|
variable "xray_reality_clients" { type = list(map(string)) }
|
|
variable "xray_reality_private_key" { type = string }
|
|
variable "xray_reality_short_ids" { type = list(string) }
|
|
|
|
# Github repo - https://github.com/teddysun/across/blob/master/docker/xray/README.md
|
|
# Clients:
|
|
# iOS - OneXRay - https://github.com/OneXray/OneXray
|
|
# MacOS - V2BOX
|
|
|
|
|
|
module "tls_secret" {
|
|
source = "../../../../modules/kubernetes/setup_tls_secret"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
resource "kubernetes_namespace" "xray" {
|
|
metadata {
|
|
name = "xray"
|
|
labels = {
|
|
tier = var.tier
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_config_map" "xray_config" {
|
|
metadata {
|
|
name = "xray-config"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
|
|
labels = {
|
|
app = "xray"
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/match" = "true"
|
|
}
|
|
}
|
|
|
|
data = {
|
|
"config.json" = templatefile("${path.module}/xray_config.json.tpl", {
|
|
clients = jsonencode(var.xray_reality_clients)
|
|
reality_private_key = var.xray_reality_private_key
|
|
reality_short_ids = jsonencode(var.xray_reality_short_ids)
|
|
})
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_deployment" "xray" {
|
|
metadata {
|
|
name = "xray"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
labels = {
|
|
app = "xray"
|
|
tier = var.tier
|
|
}
|
|
annotations = {
|
|
"reloader.stakater.com/search" = "true"
|
|
}
|
|
}
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
rolling_update {
|
|
max_surge = "2"
|
|
max_unavailable = "0"
|
|
}
|
|
}
|
|
selector {
|
|
match_labels = {
|
|
app = "xray"
|
|
}
|
|
}
|
|
template {
|
|
metadata {
|
|
labels = {
|
|
app = "xray"
|
|
}
|
|
}
|
|
spec {
|
|
container {
|
|
image = "teddysun/xray"
|
|
name = "xray"
|
|
image_pull_policy = "IfNotPresent"
|
|
port {
|
|
container_port = 6443 // vless
|
|
protocol = "TCP"
|
|
}
|
|
port {
|
|
container_port = 7443 // reality
|
|
protocol = "TCP"
|
|
}
|
|
port {
|
|
container_port = 8443 // websocket
|
|
protocol = "TCP"
|
|
}
|
|
port {
|
|
container_port = 9443 // gRPC
|
|
protocol = "TCP"
|
|
}
|
|
volume_mount {
|
|
name = "tls"
|
|
mount_path = "/etc/xray/tls.crt"
|
|
sub_path = "tls.crt"
|
|
}
|
|
volume_mount {
|
|
name = "tls"
|
|
mount_path = "/etc/xray/tls.key"
|
|
sub_path = "tls.key"
|
|
}
|
|
volume_mount {
|
|
name = "config"
|
|
mount_path = "/etc/xray/config.json"
|
|
sub_path = "config.json"
|
|
}
|
|
resources {
|
|
requests = {
|
|
cpu = "10m"
|
|
memory = "32Mi"
|
|
}
|
|
limits = {
|
|
cpu = "100m"
|
|
memory = "128Mi"
|
|
}
|
|
}
|
|
}
|
|
|
|
volume {
|
|
name = "tls"
|
|
secret {
|
|
secret_name = var.tls_secret_name
|
|
}
|
|
}
|
|
volume {
|
|
name = "config"
|
|
config_map {
|
|
name = "xray-config"
|
|
}
|
|
}
|
|
dns_config {
|
|
option {
|
|
name = "ndots"
|
|
value = "2"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "xray" {
|
|
metadata {
|
|
name = "xray"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
labels = {
|
|
"app" = "xray"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
selector = {
|
|
app = "xray"
|
|
}
|
|
port {
|
|
name = "vless"
|
|
port = 6443
|
|
protocol = "TCP"
|
|
}
|
|
port {
|
|
name = "websocket"
|
|
port = 8443
|
|
protocol = "TCP"
|
|
}
|
|
port {
|
|
name = "grpc"
|
|
port = 9443
|
|
protocol = "TCP"
|
|
}
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_service" "xray-reality" {
|
|
metadata {
|
|
name = "xray-reality"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
labels = {
|
|
"app" = "xray"
|
|
}
|
|
}
|
|
|
|
spec {
|
|
type = "LoadBalancer"
|
|
selector = {
|
|
app = "xray"
|
|
}
|
|
port {
|
|
name = "reality"
|
|
port = 7443
|
|
protocol = "TCP"
|
|
}
|
|
}
|
|
}
|
|
|
|
module "ingress_ws" {
|
|
source = "../../../../modules/kubernetes/ingress_factory"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
name = "xray-ws"
|
|
service_name = "xray"
|
|
host = "xray-ws"
|
|
port = 8443
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|
|
|
|
module "ingress_grpc" {
|
|
source = "../../../../modules/kubernetes/ingress_factory"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
name = "xray-grpc"
|
|
service_name = "xray"
|
|
host = "xray-grpc"
|
|
port = 9443
|
|
tls_secret_name = var.tls_secret_name
|
|
ingress_path = ["/grpc-vpn"]
|
|
extra_annotations = {
|
|
"traefik.ingress.kubernetes.io/service.serversscheme" = "h2c"
|
|
}
|
|
}
|
|
|
|
module "ingress_vless" {
|
|
source = "../../../../modules/kubernetes/ingress_factory"
|
|
namespace = kubernetes_namespace.xray.metadata[0].name
|
|
name = "xray-vless"
|
|
service_name = "xray"
|
|
host = "xray-vless"
|
|
port = 6443
|
|
tls_secret_name = var.tls_secret_name
|
|
}
|