fix: restore tree dropped by 6d224861; land stem95su gdrive-sync (10m) [ci skip]
6d224861 came from a --no-checkout worktree whose empty index made the
commit drop every file except two. This restores 05b50d2b's full tree and
correctly adds stacks/stem95su/gdrive-sync.tf + the service-catalog stem95su
entry. Forward-only (parent=6d224861, no force-push); [ci skip] since the
live infra was never applied from the broken commit.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>This commit is contained in:
Viktor Barzin
parent
6d224861c4
commit
fd0f4a0365
1166 changed files with 358546 additions and 0 deletions
244
stacks/xray/modules/xray/main.tf
Normal file
244
stacks/xray/modules/xray/main.tf
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
variable "tls_secret_name" {}
|
||||
variable "tier" { type = string }
|
||||
variable "xray_reality_clients" { type = list(map(string)) }
|
||||
variable "xray_reality_private_key" {
|
||||
type = string
|
||||
sensitive = true
|
||||
}
|
||||
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
|
||||
"keel.sh/enrolled" = "true"
|
||||
}
|
||||
}
|
||||
lifecycle {
|
||||
# KYVERNO_LIFECYCLE_V1: goldilocks-vpa-auto-mode ClusterPolicy stamps this label on every namespace
|
||||
ignore_changes = [metadata[0].labels["goldilocks.fairwinds.com/vpa-update-mode"]]
|
||||
}
|
||||
}
|
||||
|
||||
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 = 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 = "64Mi"
|
||||
}
|
||||
limits = {
|
||||
memory = "64Mi"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
lifecycle {
|
||||
# KYVERNO_LIFECYCLE_V1: Kyverno admission webhook mutates dns_config with ndots=2
|
||||
ignore_changes = [spec[0].template[0].spec[0].dns_config]
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubernetes_service" "xray" {
|
||||
metadata {
|
||||
name = "xray"
|
||||
namespace = kubernetes_namespace.xray.metadata[0].name
|
||||
labels = {
|
||||
"app" = "xray"
|
||||
}
|
||||
}
|
||||
|
||||
spec {
|
||||
selector = {
|
||||
app = "xray"
|
||||
}
|
||||
port {
|
||||
name = "websocket"
|
||||
port = 8443
|
||||
target_port = 8443
|
||||
protocol = "TCP"
|
||||
}
|
||||
port {
|
||||
name = "grpc"
|
||||
port = 9443
|
||||
target_port = 9443
|
||||
protocol = "TCP"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubernetes_service" "xray-reality" {
|
||||
metadata {
|
||||
name = "xray-reality"
|
||||
namespace = kubernetes_namespace.xray.metadata[0].name
|
||||
labels = {
|
||||
"app" = "xray"
|
||||
}
|
||||
annotations = {
|
||||
"metallb.io/loadBalancerIPs" = "10.0.20.200"
|
||||
"metallb.io/allow-shared-ip" = "shared"
|
||||
}
|
||||
}
|
||||
|
||||
spec {
|
||||
type = "LoadBalancer"
|
||||
selector = {
|
||||
app = "xray"
|
||||
}
|
||||
port {
|
||||
name = "reality"
|
||||
port = 7443
|
||||
protocol = "TCP"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module "ingress_ws" {
|
||||
source = "../../../../modules/kubernetes/ingress_factory"
|
||||
# VPN protocol (WebSocket transport) — native xray clients, not browsers.
|
||||
# auth = "none": VPN protocol (WebSocket transport) — native xray clients, not browsers; forward-auth incompatible.
|
||||
auth = "none"
|
||||
dns_type = "proxied"
|
||||
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"
|
||||
# VPN protocol (gRPC transport) — native xray clients, not browsers.
|
||||
# auth = "none": VPN protocol (gRPC transport) — native xray clients, not browsers; forward-auth incompatible.
|
||||
auth = "none"
|
||||
dns_type = "proxied"
|
||||
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"
|
||||
}
|
||||
}
|
||||
|
||||
80
stacks/xray/modules/xray/xray_config.json.tpl
Normal file
80
stacks/xray/modules/xray/xray_config.json.tpl
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{
|
||||
"log": {
|
||||
"loglevel": "none"
|
||||
},
|
||||
"inbounds": [
|
||||
{
|
||||
"port": 7443,
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"clients": ${clients},
|
||||
"decryption": "none"
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"show": false,
|
||||
"dest": "www.cloudflare.com:443",
|
||||
"xver": 0,
|
||||
"serverNames": [
|
||||
"www.cloudflare.com"
|
||||
],
|
||||
"privateKey": "${reality_private_key}",
|
||||
"shortIds": ${reality_short_ids}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"port": 8443,
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"clients": ${clients},
|
||||
"decryption": "none"
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "ws",
|
||||
"security": "none",
|
||||
"tlsSettings": {
|
||||
"certificates": [
|
||||
{
|
||||
"certificateFile": "/etc/xray/tls.crt",
|
||||
"keyFile": "/etc/xray/tls.key"
|
||||
}
|
||||
]
|
||||
},
|
||||
"wsSettings": {
|
||||
"path": "/ws"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"port": 9443,
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"clients": ${clients},
|
||||
"decryption": "none"
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "xhttp",
|
||||
"security": "none",
|
||||
"tlsSettings": {
|
||||
"certificates": [
|
||||
{
|
||||
"certificateFile": "/etc/xray/tls.crt",
|
||||
"keyFile": "/etc/xray/tls.key"
|
||||
}
|
||||
]
|
||||
},
|
||||
"xhttpSettings": {
|
||||
"path": "/grpc-vpn"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"outbounds": [
|
||||
{
|
||||
"protocol": "freedom"
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue