Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 46a5d381f3 | |||
| 0a3430ea97 | |||
| 1212017945 |
@@ -25,6 +25,7 @@ ArgoCD homelab project
|
|||||||
| **longhorn** | [](https://ag.hexor.cy/applications/argocd/longhorn) |
|
| **longhorn** | [](https://ag.hexor.cy/applications/argocd/longhorn) |
|
||||||
| **postgresql** | [](https://ag.hexor.cy/applications/argocd/postgresql) |
|
| **postgresql** | [](https://ag.hexor.cy/applications/argocd/postgresql) |
|
||||||
| **prom-stack** | [](https://ag.hexor.cy/applications/argocd/prom-stack) |
|
| **prom-stack** | [](https://ag.hexor.cy/applications/argocd/prom-stack) |
|
||||||
|
| **reloader** | [](https://ag.hexor.cy/applications/argocd/reloader) |
|
||||||
| **system-upgrade** | [](https://ag.hexor.cy/applications/argocd/system-upgrade) |
|
| **system-upgrade** | [](https://ag.hexor.cy/applications/argocd/system-upgrade) |
|
||||||
|
|
||||||
### Games
|
### Games
|
||||||
|
|||||||
@@ -236,29 +236,52 @@ data:
|
|||||||
|
|
||||||
cd /app
|
cd /app
|
||||||
|
|
||||||
# Start main process in background
|
write_xray_api_port() {
|
||||||
./main &
|
API_PORT="$1"
|
||||||
MAIN_PID=$!
|
case "$API_PORT" in
|
||||||
|
""|*[!0-9]*)
|
||||||
# Start continuous port monitoring in background
|
return
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CURRENT_PORT=""
|
||||||
|
if [ -f /shared/xray-api-port ]; then
|
||||||
|
CURRENT_PORT=$(cat /shared/xray-api-port)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$API_PORT" != "$CURRENT_PORT" ]; then
|
||||||
|
echo "Found xray API port: $API_PORT"
|
||||||
|
echo -n "$API_PORT" > /shared/xray-api-port
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG_PIPE="/tmp/pasarguard-main.log"
|
||||||
|
rm -f "$LOG_PIPE"
|
||||||
|
mkfifo "$LOG_PIPE"
|
||||||
|
|
||||||
|
# Capture main logs so the Xray API listener is not confused with Xray's metrics listener.
|
||||||
{
|
{
|
||||||
sleep 10 # Wait for xray to start initially
|
while IFS= read -r line; do
|
||||||
LAST_PORT=""
|
echo "$line"
|
||||||
|
case "$line" in
|
||||||
while true; do
|
*"transport/internet/tcp: listening TCP on 127.0.0.1:"*)
|
||||||
API_PORT=$(netstat -tlpn | grep xray | grep 127.0.0.1 | awk '{print $4}' | cut -d: -f2 | head -1)
|
API_PORT=$(echo "$line" | sed -n 's/.*listening TCP on 127\.0\.0\.1:\([0-9][0-9]*\).*/\1/p')
|
||||||
if [ -n "$API_PORT" ] && [ "$API_PORT" != "$LAST_PORT" ]; then
|
write_xray_api_port "$API_PORT"
|
||||||
echo "Found xray API port: $API_PORT"
|
;;
|
||||||
echo -n "$API_PORT" > /shared/xray-api-port
|
esac
|
||||||
LAST_PORT="$API_PORT"
|
|
||||||
fi
|
|
||||||
sleep 5 # Check every 5 seconds
|
|
||||||
done
|
done
|
||||||
} &
|
} < "$LOG_PIPE" &
|
||||||
PORT_MONITOR_PID=$!
|
LOG_READER_PID=$!
|
||||||
|
|
||||||
|
# Start main process in background
|
||||||
|
./main > "$LOG_PIPE" 2>&1 &
|
||||||
|
MAIN_PID=$!
|
||||||
|
|
||||||
# Wait for main process to finish
|
# Wait for main process to finish
|
||||||
wait $MAIN_PID
|
wait $MAIN_PID
|
||||||
|
MAIN_STATUS=$?
|
||||||
# Clean up port monitor
|
|
||||||
kill $PORT_MONITOR_PID 2>/dev/null
|
# Clean up log reader
|
||||||
|
wait $LOG_READER_PID 2>/dev/null
|
||||||
|
rm -f "$LOG_PIPE"
|
||||||
|
exit $MAIN_STATUS
|
||||||
|
|||||||
@@ -116,14 +116,20 @@ spec:
|
|||||||
- name: metrics
|
- name: metrics
|
||||||
containerPort: 9550
|
containerPort: 9550
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
livenessProbe:
|
startupProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /scrape
|
path: /scrape
|
||||||
port: metrics
|
port: metrics
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 5
|
||||||
|
failureThreshold: 36
|
||||||
|
livenessProbe:
|
||||||
|
tcpSocket:
|
||||||
|
port: metrics
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
periodSeconds: 30
|
periodSeconds: 30
|
||||||
timeoutSeconds: 10
|
timeoutSeconds: 10
|
||||||
failureThreshold: 3
|
failureThreshold: 6
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /scrape
|
path: /scrape
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
apiVersion: argoproj.io/v1alpha1
|
||||||
|
kind: Application
|
||||||
|
metadata:
|
||||||
|
name: reloader
|
||||||
|
namespace: argocd
|
||||||
|
spec:
|
||||||
|
project: core
|
||||||
|
destination:
|
||||||
|
namespace: reloader
|
||||||
|
server: https://kubernetes.default.svc
|
||||||
|
source:
|
||||||
|
repoURL: ssh://git@gt.hexor.cy:30022/ab/homelab.git
|
||||||
|
targetRevision: HEAD
|
||||||
|
path: k8s/core/reloader
|
||||||
|
syncPolicy:
|
||||||
|
automated:
|
||||||
|
selfHeal: true
|
||||||
|
prune: true
|
||||||
|
syncOptions:
|
||||||
|
- CreateNamespace=true
|
||||||
|
- ServerSideApply=true
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
|
kind: Kustomization
|
||||||
|
|
||||||
|
resources:
|
||||||
|
- app.yaml
|
||||||
|
|
||||||
|
helmCharts:
|
||||||
|
- name: reloader
|
||||||
|
repo: https://stakater.github.io/stakater-charts
|
||||||
|
version: 2.2.12
|
||||||
|
releaseName: reloader
|
||||||
|
namespace: reloader
|
||||||
|
valuesFile: values.yaml
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
reloader:
|
||||||
|
watchGlobally: true
|
||||||
|
autoReloadAll: true
|
||||||
|
reloadOnCreate: true
|
||||||
|
reloadOnDelete: false
|
||||||
|
reloadStrategy: annotations
|
||||||
|
ignoreConfigMaps: false
|
||||||
|
ignoreSecrets: false
|
||||||
|
ignoreJobs: false
|
||||||
|
ignoreCronJobs: false
|
||||||
|
enableHA: true
|
||||||
|
syncAfterRestart: true
|
||||||
|
logLevel: info
|
||||||
|
rbac:
|
||||||
|
enabled: true
|
||||||
|
deployment:
|
||||||
|
replicas: 2
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 10m
|
||||||
|
memory: 128Mi
|
||||||
|
limits:
|
||||||
|
cpu: 150m
|
||||||
|
memory: 512Mi
|
||||||
Reference in New Issue
Block a user