From 95913c3f73135a75a6ad86d6bcab2a4417b64daa Mon Sep 17 00:00:00 2001 From: Ultradesu Date: Mon, 8 Dec 2025 18:01:25 +0200 Subject: [PATCH] Reworked pasarguard nodes daemonset. --- k8s/apps/pasarguard/configmap-scripts-ingress.yaml | 5 ++--- k8s/apps/pasarguard/daemonset-ingress.yaml | 8 -------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/k8s/apps/pasarguard/configmap-scripts-ingress.yaml b/k8s/apps/pasarguard/configmap-scripts-ingress.yaml index 730a0f0..fe17209 100644 --- a/k8s/apps/pasarguard/configmap-scripts-ingress.yaml +++ b/k8s/apps/pasarguard/configmap-scripts-ingress.yaml @@ -254,8 +254,7 @@ data: # Detect xray API port BEFORE starting monitoring loop echo "Detecting xray API port..." for i in $(seq 1 60); do - # Without hostNetwork, use ss to check listening ports in the same network namespace - API_PORT=$(ss -tlnp 2>/dev/null | grep xray | grep 127.0.0.1 | awk '{print $4}' | sed 's/.*://' | head -1) + API_PORT=$(netstat -tlnp 2>/dev/null | grep xray | grep 127.0.0.1 | awk '{print $4}' | cut -d: -f2 | head -1) if [ -n "$API_PORT" ]; then echo "Found xray API port: $API_PORT" echo -n "$API_PORT" > /shared/xray-api-port @@ -274,7 +273,7 @@ data: LAST_PORT="$API_PORT" while true; do - API_PORT=$(ss -tlnp 2>/dev/null | grep xray | grep 127.0.0.1 | awk '{print $4}' | sed 's/.*://' | head -1) + API_PORT=$(netstat -tlnp 2>/dev/null | grep xray | grep 127.0.0.1 | awk '{print $4}' | cut -d: -f2 | head -1) if [ -n "$API_PORT" ] && [ "$API_PORT" != "$LAST_PORT" ]; then echo "API port changed from $LAST_PORT to $API_PORT" echo -n "$API_PORT" > /shared/xray-api-port diff --git a/k8s/apps/pasarguard/daemonset-ingress.yaml b/k8s/apps/pasarguard/daemonset-ingress.yaml index cdb18a5..cf1731e 100644 --- a/k8s/apps/pasarguard/daemonset-ingress.yaml +++ b/k8s/apps/pasarguard/daemonset-ingress.yaml @@ -132,14 +132,6 @@ spec: periodSeconds: 30 timeoutSeconds: 10 failureThreshold: 3 - readinessProbe: - httpGet: - path: /scrape - port: metrics - initialDelaySeconds: 45 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 3 resources: requests: memory: "64Mi"