Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f43747a0b |
@@ -126,11 +126,8 @@ data:
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
SERVER_CONFIG="/etc/amnezia/server/awg0.conf"
|
SERVER_CONFIG="/etc/amnezia/server/awg0.conf"
|
||||||
CLIENTS_DIR="${AMNEZIAWG_CLIENTS_DIR:-/run/amnezia/clients}"
|
CLIENTS_DIR="/etc/amnezia/clients"
|
||||||
RUNTIME_CONFIG="/run/amnezia/awg0.conf"
|
RUNTIME_CONFIG="/run/amnezia/awg0.conf"
|
||||||
SYNC_CONFIG="/run/amnezia/awg0.sync.conf"
|
|
||||||
STATUS_FILE="/run/amnezia/reload-status"
|
|
||||||
RELOAD_INTERVAL="${AMNEZIAWG_RELOAD_INTERVAL:-10}"
|
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
if awg show awg0 >/dev/null 2>&1; then
|
if awg show awg0 >/dev/null 2>&1; then
|
||||||
@@ -140,181 +137,32 @@ data:
|
|||||||
|
|
||||||
render_config() {
|
render_config() {
|
||||||
mkdir -p "$(dirname "${RUNTIME_CONFIG}")"
|
mkdir -p "$(dirname "${RUNTIME_CONFIG}")"
|
||||||
local tmp_config="${RUNTIME_CONFIG}.tmp"
|
cp "${SERVER_CONFIG}" "${RUNTIME_CONFIG}"
|
||||||
cp "${SERVER_CONFIG}" "${tmp_config}"
|
chmod 0600 "${RUNTIME_CONFIG}"
|
||||||
chmod 0600 "${tmp_config}"
|
|
||||||
|
|
||||||
local clients_found=0
|
local clients_found=0
|
||||||
for client_config in "${CLIENTS_DIR}"/*; do
|
for client_config in "${CLIENTS_DIR}"/*; do
|
||||||
[ -f "${client_config}" ] || continue
|
[ -f "${client_config}" ] || continue
|
||||||
[ -s "${client_config}" ] || continue
|
[ -s "${client_config}" ] || continue
|
||||||
printf '\n' >> "${tmp_config}"
|
printf '\n' >> "${RUNTIME_CONFIG}"
|
||||||
cat "${client_config}" >> "${tmp_config}"
|
cat "${client_config}" >> "${RUNTIME_CONFIG}"
|
||||||
clients_found=1
|
clients_found=1
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "${clients_found}" = "0" ]; then
|
if [ "${clients_found}" = "0" ]; then
|
||||||
echo "No client peer configs found in ${CLIENTS_DIR}; starting without peers"
|
echo "No client peer configs found in ${CLIENTS_DIR}; starting without peers"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mv "${tmp_config}" "${RUNTIME_CONFIG}"
|
|
||||||
chmod 0600 "${RUNTIME_CONFIG}"
|
|
||||||
}
|
|
||||||
|
|
||||||
client_config_hash() {
|
|
||||||
{
|
|
||||||
for client_config in "${CLIENTS_DIR}"/*; do
|
|
||||||
[ -f "${client_config}" ] || continue
|
|
||||||
sha256sum "${client_config}"
|
|
||||||
done
|
|
||||||
} | sha256sum | awk '{print $1}'
|
|
||||||
}
|
|
||||||
|
|
||||||
write_reload_status() {
|
|
||||||
local state="${1}"
|
|
||||||
local hash="${2:-}"
|
|
||||||
local applied_at_ms=""
|
|
||||||
if [ "${state}" = "applied" ]; then
|
|
||||||
applied_at_ms="$(($(date +%s) * 1000))"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "$(dirname "${STATUS_FILE}")"
|
|
||||||
{
|
|
||||||
printf 'state=%s\n' "${state}"
|
|
||||||
printf 'hash=%s\n' "${hash}"
|
|
||||||
printf 'applied_at_ms=%s\n' "${applied_at_ms}"
|
|
||||||
} > "${STATUS_FILE}.tmp"
|
|
||||||
mv "${STATUS_FILE}.tmp" "${STATUS_FILE}"
|
|
||||||
}
|
|
||||||
|
|
||||||
apply_live_config() {
|
|
||||||
render_config
|
|
||||||
awg-quick strip "${RUNTIME_CONFIG}" > "${SYNC_CONFIG}"
|
|
||||||
chmod 0600 "${SYNC_CONFIG}"
|
|
||||||
awg syncconf awg0 "${SYNC_CONFIG}"
|
|
||||||
}
|
|
||||||
|
|
||||||
watch_client_config() {
|
|
||||||
local last_hash="${1}"
|
|
||||||
while true; do
|
|
||||||
sleep "${RELOAD_INTERVAL}" &
|
|
||||||
wait "$!" || return 0
|
|
||||||
|
|
||||||
local current_hash
|
|
||||||
current_hash="$(client_config_hash)"
|
|
||||||
if [ "${current_hash}" = "${last_hash}" ]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Detected AmneziaWG client peer config change; applying with awg syncconf"
|
|
||||||
if apply_live_config; then
|
|
||||||
last_hash="${current_hash}"
|
|
||||||
write_reload_status applied "${current_hash}"
|
|
||||||
awg show awg0 || true
|
|
||||||
else
|
|
||||||
echo "ERROR: failed to hot-reload AmneziaWG client peer config" >&2
|
|
||||||
write_reload_status error "${current_hash}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
trap 'exit 0' TERM INT
|
trap 'exit 0' TERM INT
|
||||||
|
|
||||||
initial_hash="$(client_config_hash)"
|
|
||||||
render_config
|
render_config
|
||||||
cleanup
|
cleanup
|
||||||
awg-quick up "${RUNTIME_CONFIG}"
|
awg-quick up "${RUNTIME_CONFIG}"
|
||||||
awg show awg0 || true
|
awg show awg0 || true
|
||||||
write_reload_status applied "${initial_hash}"
|
|
||||||
watch_client_config "${initial_hash}"
|
|
||||||
|
|
||||||
client-secret-sync.sh: |
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
CLIENT_SECRET="${AMNEZIAWG_CLIENT_SECRET:-amneziawg-clients}"
|
|
||||||
CLIENT_SECRET_KEY="${AMNEZIAWG_CLIENT_SECRET_KEY:-peers.conf}"
|
|
||||||
CLIENTS_DIR="${AMNEZIAWG_CLIENTS_DIR:-/run/amnezia/clients}"
|
|
||||||
PEERS_FILE="${CLIENTS_DIR}/peers.conf"
|
|
||||||
SYNC_INTERVAL="${AMNEZIAWG_CLIENT_SECRET_SYNC_INTERVAL:-5}"
|
|
||||||
NAMESPACE="${POD_NAMESPACE:-$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)}"
|
|
||||||
|
|
||||||
write_empty_once() {
|
|
||||||
mkdir -p "${CLIENTS_DIR}"
|
|
||||||
if [ ! -f "${PEERS_FILE}" ]; then
|
|
||||||
: > "${PEERS_FILE}"
|
|
||||||
chmod 0600 "${PEERS_FILE}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
sync_once() {
|
|
||||||
mkdir -p "${CLIENTS_DIR}"
|
|
||||||
local tmp_file="${PEERS_FILE}.tmp"
|
|
||||||
local encoded=""
|
|
||||||
|
|
||||||
if ! encoded="$(kubectl get secret "${CLIENT_SECRET}" -n "${NAMESPACE}" -o "go-template={{ index .data \"${CLIENT_SECRET_KEY}\" }}" 2>/dev/null)"; then
|
|
||||||
echo "WARN: failed to read Secret ${NAMESPACE}/${CLIENT_SECRET}; keeping current peers" >&2
|
|
||||||
write_empty_once
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "${encoded}" ]; then
|
|
||||||
printf '%s' "${encoded}" | base64 -d > "${tmp_file}"
|
|
||||||
else
|
|
||||||
: > "${tmp_file}"
|
|
||||||
fi
|
|
||||||
chmod 0600 "${tmp_file}"
|
|
||||||
|
|
||||||
if [ -f "${PEERS_FILE}" ] && cmp -s "${tmp_file}" "${PEERS_FILE}"; then
|
|
||||||
rm -f "${tmp_file}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
mv "${tmp_file}" "${PEERS_FILE}"
|
|
||||||
echo "Synced AmneziaWG client peers from Secret ${NAMESPACE}/${CLIENT_SECRET}:${CLIENT_SECRET_KEY}"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "${1:-}" = "once" ]; then
|
|
||||||
sync_once
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
sync_once || true
|
sleep 3600 &
|
||||||
sleep "${SYNC_INTERVAL}"
|
wait "$!"
|
||||||
done
|
|
||||||
|
|
||||||
status-patch.sh: |
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
STATUS_FILE="/run/amnezia/reload-status"
|
|
||||||
PATCH_INTERVAL="${AMNEZIAWG_STATUS_PATCH_INTERVAL:-5}"
|
|
||||||
NAMESPACE="${POD_NAMESPACE:-$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)}"
|
|
||||||
: "${POD_NAME:?POD_NAME is required}"
|
|
||||||
|
|
||||||
last_file_hash=""
|
|
||||||
|
|
||||||
patch_status() {
|
|
||||||
local state="unknown"
|
|
||||||
local hash=""
|
|
||||||
local applied_at_ms=""
|
|
||||||
|
|
||||||
# The file is generated by run.sh and contains only shell assignments.
|
|
||||||
# shellcheck disable=SC1090
|
|
||||||
source "${STATUS_FILE}"
|
|
||||||
|
|
||||||
kubectl patch pod "${POD_NAME}" -n "${NAMESPACE}" --type merge -p "{\"metadata\":{\"annotations\":{\"amnezia-fellow.hexor.cy/client-secret-reload-status\":\"${state}\",\"amnezia-fellow.hexor.cy/client-secret-applied-at-ms\":\"${applied_at_ms}\",\"amnezia-fellow.hexor.cy/client-secret-applied-hash\":\"${hash}\"}}}"
|
|
||||||
}
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
if [ -f "${STATUS_FILE}" ]; then
|
|
||||||
file_hash="$(sha256sum "${STATUS_FILE}" | awk '{print $1}')"
|
|
||||||
if [ "${file_hash}" != "${last_file_hash}" ]; then
|
|
||||||
patch_status || true
|
|
||||||
last_file_hash="${file_hash}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
sleep "${PATCH_INTERVAL}"
|
|
||||||
done
|
done
|
||||||
|
|||||||
+10
-147
@@ -6,9 +6,8 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
app: amneziawg
|
app: amneziawg
|
||||||
annotations:
|
annotations:
|
||||||
reloader.stakater.com/auto: "false"
|
reloader.stakater.com/auto: "true"
|
||||||
secret.reloader.stakater.com/reload: "amneziawg-server"
|
secret.reloader.stakater.com/reload: "amneziawg-server,amneziawg-clients"
|
||||||
configmap.reloader.stakater.com/reload: "amneziawg-scripts,amneziawg-exporter-redis"
|
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
@@ -28,21 +27,6 @@ spec:
|
|||||||
tolerations:
|
tolerations:
|
||||||
- operator: Exists
|
- operator: Exists
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: install-awg
|
|
||||||
image: amneziavpn/amneziawg-go:latest
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command:
|
|
||||||
- /bin/bash
|
|
||||||
- -lc
|
|
||||||
- |
|
|
||||||
set -euo pipefail
|
|
||||||
cp /usr/bin/awg /shared-bin/awg
|
|
||||||
cp /lib/ld-musl-x86_64.so.1 /shared-bin/ld-musl-x86_64.so.1
|
|
||||||
cp /lib/ld-musl-x86_64.so.1 /shared-bin/libc.musl-x86_64.so.1
|
|
||||||
chmod 0755 /shared-bin/awg /shared-bin/ld-musl-x86_64.so.1 /shared-bin/libc.musl-x86_64.so.1
|
|
||||||
volumeMounts:
|
|
||||||
- name: awg-bin
|
|
||||||
mountPath: /shared-bin
|
|
||||||
- name: register-endpoint
|
- name: register-endpoint
|
||||||
image: bitnami/kubectl:latest
|
image: bitnami/kubectl:latest
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
@@ -81,26 +65,6 @@ spec:
|
|||||||
kubectl create secret generic amneziawg-endpoints -n "${NAMESPACE}" \
|
kubectl create secret generic amneziawg-endpoints -n "${NAMESPACE}" \
|
||||||
--from-literal="${NODE_NAME}=${VALUE}"
|
--from-literal="${NODE_NAME}=${VALUE}"
|
||||||
fi
|
fi
|
||||||
- name: sync-client-secret
|
|
||||||
image: bitnami/kubectl:latest
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command:
|
|
||||||
- /bin/bash
|
|
||||||
- /scripts/client-secret-sync.sh
|
|
||||||
- once
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "10m"
|
|
||||||
limits:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "100m"
|
|
||||||
volumeMounts:
|
|
||||||
- name: scripts
|
|
||||||
mountPath: /scripts
|
|
||||||
readOnly: true
|
|
||||||
- name: runtime-config
|
|
||||||
mountPath: /run/amnezia
|
|
||||||
containers:
|
containers:
|
||||||
- name: amneziawg
|
- name: amneziawg
|
||||||
image: amneziavpn/amneziawg-go:latest
|
image: amneziavpn/amneziawg-go:latest
|
||||||
@@ -149,6 +113,9 @@ spec:
|
|||||||
- name: server-config
|
- name: server-config
|
||||||
mountPath: /etc/amnezia/server
|
mountPath: /etc/amnezia/server
|
||||||
readOnly: true
|
readOnly: true
|
||||||
|
- name: client-config
|
||||||
|
mountPath: /etc/amnezia/clients
|
||||||
|
readOnly: true
|
||||||
- name: scripts
|
- name: scripts
|
||||||
mountPath: /scripts
|
mountPath: /scripts
|
||||||
readOnly: true
|
readOnly: true
|
||||||
@@ -156,108 +123,6 @@ spec:
|
|||||||
mountPath: /run/amnezia
|
mountPath: /run/amnezia
|
||||||
- name: dev-net-tun
|
- name: dev-net-tun
|
||||||
mountPath: /dev/net/tun
|
mountPath: /dev/net/tun
|
||||||
- name: reload-status
|
|
||||||
image: bitnami/kubectl:latest
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
env:
|
|
||||||
- name: POD_NAME
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: metadata.name
|
|
||||||
command:
|
|
||||||
- /bin/bash
|
|
||||||
- /scripts/status-patch.sh
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "10m"
|
|
||||||
limits:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "100m"
|
|
||||||
volumeMounts:
|
|
||||||
- name: scripts
|
|
||||||
mountPath: /scripts
|
|
||||||
readOnly: true
|
|
||||||
- name: runtime-config
|
|
||||||
mountPath: /run/amnezia
|
|
||||||
- name: client-secret-sync
|
|
||||||
image: bitnami/kubectl:latest
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command:
|
|
||||||
- /bin/bash
|
|
||||||
- /scripts/client-secret-sync.sh
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "10m"
|
|
||||||
limits:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "100m"
|
|
||||||
volumeMounts:
|
|
||||||
- name: scripts
|
|
||||||
mountPath: /scripts
|
|
||||||
readOnly: true
|
|
||||||
- name: runtime-config
|
|
||||||
mountPath: /run/amnezia
|
|
||||||
- name: amneziawg-exporter-redis
|
|
||||||
image: redis:alpine
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command:
|
|
||||||
- redis-server
|
|
||||||
- /etc/redis/redis.conf
|
|
||||||
ports:
|
|
||||||
- name: redis
|
|
||||||
containerPort: 6379
|
|
||||||
protocol: TCP
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "10m"
|
|
||||||
limits:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "100m"
|
|
||||||
volumeMounts:
|
|
||||||
- name: exporter-redis-config
|
|
||||||
mountPath: /etc/redis
|
|
||||||
readOnly: true
|
|
||||||
- name: exporter-redis-data
|
|
||||||
mountPath: /data
|
|
||||||
- name: amneziawg-exporter
|
|
||||||
image: amneziavpn/amneziawg-exporter:latest
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
securityContext:
|
|
||||||
capabilities:
|
|
||||||
add:
|
|
||||||
- NET_ADMIN
|
|
||||||
env:
|
|
||||||
- name: AWG_EXPORTER_REDIS_HOST
|
|
||||||
value: "127.0.0.1"
|
|
||||||
- name: AWG_EXPORTER_REDIS_PORT
|
|
||||||
value: "6379"
|
|
||||||
ports:
|
|
||||||
- name: metrics
|
|
||||||
containerPort: 9351
|
|
||||||
protocol: TCP
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "64Mi"
|
|
||||||
cpu: "25m"
|
|
||||||
limits:
|
|
||||||
memory: "256Mi"
|
|
||||||
cpu: "200m"
|
|
||||||
volumeMounts:
|
|
||||||
- name: awg-bin
|
|
||||||
mountPath: /usr/bin/awg
|
|
||||||
subPath: awg
|
|
||||||
readOnly: true
|
|
||||||
- name: awg-bin
|
|
||||||
mountPath: /lib/ld-musl-x86_64.so.1
|
|
||||||
subPath: ld-musl-x86_64.so.1
|
|
||||||
readOnly: true
|
|
||||||
- name: awg-bin
|
|
||||||
mountPath: /lib/libc.musl-x86_64.so.1
|
|
||||||
subPath: libc.musl-x86_64.so.1
|
|
||||||
readOnly: true
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: server-config
|
- name: server-config
|
||||||
secret:
|
secret:
|
||||||
@@ -266,19 +131,17 @@ spec:
|
|||||||
items:
|
items:
|
||||||
- key: awg0.conf
|
- key: awg0.conf
|
||||||
path: awg0.conf
|
path: awg0.conf
|
||||||
|
- name: client-config
|
||||||
|
secret:
|
||||||
|
secretName: amneziawg-clients
|
||||||
|
optional: true
|
||||||
|
defaultMode: 0600
|
||||||
- name: scripts
|
- name: scripts
|
||||||
configMap:
|
configMap:
|
||||||
name: amneziawg-scripts
|
name: amneziawg-scripts
|
||||||
defaultMode: 0755
|
defaultMode: 0755
|
||||||
- name: runtime-config
|
- name: runtime-config
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: awg-bin
|
|
||||||
emptyDir: {}
|
|
||||||
- name: exporter-redis-config
|
|
||||||
configMap:
|
|
||||||
name: amneziawg-exporter-redis
|
|
||||||
- name: exporter-redis-data
|
|
||||||
emptyDir: {}
|
|
||||||
- name: dev-net-tun
|
- name: dev-net-tun
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /dev/net/tun
|
path: /dev/net/tun
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
name: amneziawg-exporter-redis
|
|
||||||
labels:
|
|
||||||
app: amneziawg
|
|
||||||
component: exporter
|
|
||||||
data:
|
|
||||||
redis.conf: |
|
|
||||||
bind 127.0.0.1
|
|
||||||
protected-mode yes
|
|
||||||
port 6379
|
|
||||||
tcp-backlog 511
|
|
||||||
timeout 0
|
|
||||||
tcp-keepalive 300
|
|
||||||
daemonize no
|
|
||||||
pidfile /run/redis.pid
|
|
||||||
loglevel warning
|
|
||||||
logfile ""
|
|
||||||
databases 16
|
|
||||||
always-show-logo no
|
|
||||||
set-proc-title no
|
|
||||||
save ""
|
|
||||||
appendonly no
|
|
||||||
stop-writes-on-bgsave-error no
|
|
||||||
rdbcompression yes
|
|
||||||
rdbchecksum yes
|
|
||||||
dir /data
|
|
||||||
rename-command CONFIG ""
|
|
||||||
rename-command SAVE ""
|
|
||||||
rename-command BGSAVE ""
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: amneziawg-exporter
|
|
||||||
labels:
|
|
||||||
app: amneziawg
|
|
||||||
component: exporter
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
selector:
|
|
||||||
app: amneziawg
|
|
||||||
ports:
|
|
||||||
- name: metrics
|
|
||||||
protocol: TCP
|
|
||||||
port: 9351
|
|
||||||
targetPort: 9351
|
|
||||||
@@ -48,31 +48,3 @@ spec:
|
|||||||
remoteRef:
|
remoteRef:
|
||||||
key: 3092dc7c-41dd-461a-9f7a-377727f47e93
|
key: 3092dc7c-41dd-461a-9f7a-377727f47e93
|
||||||
property: fields[1].value
|
property: fields[1].value
|
||||||
---
|
|
||||||
apiVersion: external-secrets.io/v1
|
|
||||||
kind: ExternalSecret
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow
|
|
||||||
spec:
|
|
||||||
target:
|
|
||||||
name: amnezia-fellow
|
|
||||||
deletionPolicy: Delete
|
|
||||||
template:
|
|
||||||
type: Opaque
|
|
||||||
data:
|
|
||||||
database-url: |-
|
|
||||||
postgresql://amnezia_fellow:{{ .amnezia_fellow }}@psql.psql.svc:5432/amnezia_fellow
|
|
||||||
postgres-password: |-
|
|
||||||
{{ .amnezia_fellow }}
|
|
||||||
data:
|
|
||||||
- secretKey: amnezia_fellow
|
|
||||||
sourceRef:
|
|
||||||
storeRef:
|
|
||||||
name: vaultwarden-login
|
|
||||||
kind: ClusterSecretStore
|
|
||||||
remoteRef:
|
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
metadataPolicy: None
|
|
||||||
key: 2a9deb39-ef22-433e-a1be-df1555625e22
|
|
||||||
property: fields[19].value
|
|
||||||
|
|||||||
@@ -1,81 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
annotations:
|
|
||||||
secret.reloader.stakater.com/reload: "amnezia-fellow"
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
strategy:
|
|
||||||
type: Recreate
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
spec:
|
|
||||||
serviceAccountName: amnezia-fellow
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/os: linux
|
|
||||||
kubernetes.io/hostname: cy.tail2fe2d.ts.net
|
|
||||||
containers:
|
|
||||||
- name: amnezia-fellow
|
|
||||||
image: ultradesu/amnezia-fellow:latest
|
|
||||||
imagePullPolicy: Always
|
|
||||||
ports:
|
|
||||||
- name: http
|
|
||||||
containerPort: 8000
|
|
||||||
protocol: TCP
|
|
||||||
env:
|
|
||||||
- name: AMNEZIA_FELLOW_DATABASE_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: amnezia-fellow
|
|
||||||
key: database-url
|
|
||||||
- name: AMNEZIA_FELLOW_MIGRATE_SQLITE
|
|
||||||
value: "sqlite:///data/amnezia-fellow.sqlite3?mode=ro"
|
|
||||||
- name: AMNEZIA_FELLOW_K8S_NAMESPACE
|
|
||||||
value: "amnezia"
|
|
||||||
- name: AMNEZIA_FELLOW_K8S_CLIENTS_SECRET
|
|
||||||
value: "amneziawg-clients"
|
|
||||||
- name: AMNEZIA_FELLOW_K8S_CLIENTS_SECRET_KEY
|
|
||||||
value: "peers.conf"
|
|
||||||
- name: AMNEZIA_FELLOW_K8S_SERVER_SECRET
|
|
||||||
value: "amneziawg-server"
|
|
||||||
- name: AMNEZIA_FELLOW_K8S_ENDPOINTS_SECRET
|
|
||||||
value: "amneziawg-endpoints"
|
|
||||||
- name: AMNEZIA_FELLOW_VPN_CLIENT_CIDR
|
|
||||||
value: "10.8.0.0/16"
|
|
||||||
- name: AMNEZIA_FELLOW_VPN_MTU
|
|
||||||
value: "1376"
|
|
||||||
readinessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: http
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
periodSeconds: 10
|
|
||||||
timeoutSeconds: 3
|
|
||||||
livenessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: http
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
periodSeconds: 30
|
|
||||||
timeoutSeconds: 5
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: "50m"
|
|
||||||
memory: "128Mi"
|
|
||||||
limits:
|
|
||||||
cpu: "500m"
|
|
||||||
memory: "512Mi"
|
|
||||||
volumeMounts:
|
|
||||||
- name: data
|
|
||||||
mountPath: /data
|
|
||||||
volumes:
|
|
||||||
- name: data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: amnezia-fellow-data
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow-tls-ingress
|
|
||||||
annotations:
|
|
||||||
cert-manager.io/cluster-issuer: letsencrypt
|
|
||||||
traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
|
|
||||||
acme.cert-manager.io/http01-edit-in-place: "true"
|
|
||||||
spec:
|
|
||||||
ingressClassName: traefik
|
|
||||||
rules:
|
|
||||||
- host: awg.hexor.cy
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: amnezia-fellow
|
|
||||||
port:
|
|
||||||
number: 8000
|
|
||||||
tls:
|
|
||||||
- secretName: amnezia-fellow-tls
|
|
||||||
hosts:
|
|
||||||
- awg.hexor.cy
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ServiceAccount
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: Role
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
rules:
|
|
||||||
- apiGroups: [""]
|
|
||||||
resources: ["secrets"]
|
|
||||||
verbs: ["get", "create", "update", "patch"]
|
|
||||||
- apiGroups: [""]
|
|
||||||
resources: ["pods"]
|
|
||||||
verbs: ["get", "list"]
|
|
||||||
---
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
kind: RoleBinding
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
roleRef:
|
|
||||||
apiGroup: rbac.authorization.k8s.io
|
|
||||||
kind: Role
|
|
||||||
name: amnezia-fellow
|
|
||||||
subjects:
|
|
||||||
- kind: ServiceAccount
|
|
||||||
name: amnezia-fellow
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
selector:
|
|
||||||
app: amnezia-fellow
|
|
||||||
ports:
|
|
||||||
- name: http
|
|
||||||
protocol: TCP
|
|
||||||
port: 8000
|
|
||||||
targetPort: 8000
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: amnezia-fellow-data
|
|
||||||
labels:
|
|
||||||
app: amnezia-fellow
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
storageClassName: longhorn
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 3Gi
|
|
||||||
@@ -7,12 +7,4 @@ resources:
|
|||||||
- external-secrets.yaml
|
- external-secrets.yaml
|
||||||
- configmap-scripts.yaml
|
- configmap-scripts.yaml
|
||||||
- rbac.yaml
|
- rbac.yaml
|
||||||
- fellow-rbac.yaml
|
|
||||||
- fellow-storage.yaml
|
|
||||||
- fellow-service.yaml
|
|
||||||
- fellow-ingress.yaml
|
|
||||||
- fellow-deployment.yaml
|
|
||||||
- exporter-redis-configmap.yaml
|
|
||||||
- exporter-service.yaml
|
|
||||||
- servicemonitor.yaml
|
|
||||||
- daemonset.yaml
|
- daemonset.yaml
|
||||||
|
|||||||
@@ -42,9 +42,6 @@ rules:
|
|||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["secrets"]
|
resources: ["secrets"]
|
||||||
verbs: ["get", "create", "patch"]
|
verbs: ["get", "create", "patch"]
|
||||||
- apiGroups: [""]
|
|
||||||
resources: ["pods"]
|
|
||||||
verbs: ["get", "patch"]
|
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: monitoring.coreos.com/v1
|
|
||||||
kind: ServiceMonitor
|
|
||||||
metadata:
|
|
||||||
name: amneziawg-exporter
|
|
||||||
labels:
|
|
||||||
app: amneziawg
|
|
||||||
component: exporter
|
|
||||||
release: prometheus
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: amneziawg
|
|
||||||
component: exporter
|
|
||||||
endpoints:
|
|
||||||
- port: metrics
|
|
||||||
path: /metrics
|
|
||||||
interval: 30s
|
|
||||||
scrapeTimeout: 10s
|
|
||||||
honorLabels: true
|
|
||||||
namespaceSelector:
|
|
||||||
matchNames:
|
|
||||||
- amnezia
|
|
||||||
@@ -5,6 +5,6 @@ resources:
|
|||||||
- app.yaml
|
- app.yaml
|
||||||
- external-secrets.yaml
|
- external-secrets.yaml
|
||||||
- deployment.yaml
|
- deployment.yaml
|
||||||
- user-unban-cronjob.yaml
|
|
||||||
- service.yaml
|
- service.yaml
|
||||||
- ingress.yaml
|
- ingress.yaml
|
||||||
|
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: batch/v1
|
|
||||||
kind: CronJob
|
|
||||||
metadata:
|
|
||||||
name: gitea-user-unban
|
|
||||||
labels:
|
|
||||||
app: gitea-user-unban
|
|
||||||
spec:
|
|
||||||
schedule: "*/10 * * * *"
|
|
||||||
concurrencyPolicy: Forbid
|
|
||||||
successfulJobsHistoryLimit: 3
|
|
||||||
failedJobsHistoryLimit: 3
|
|
||||||
jobTemplate:
|
|
||||||
spec:
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: gitea-user-unban
|
|
||||||
spec:
|
|
||||||
restartPolicy: OnFailure
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/hostname: master.tail2fe2d.ts.net
|
|
||||||
volumes:
|
|
||||||
- name: storage
|
|
||||||
hostPath:
|
|
||||||
path: /k8s/gitea
|
|
||||||
type: Directory
|
|
||||||
containers:
|
|
||||||
- name: sqlite-unban
|
|
||||||
image: 'gitea/gitea:latest'
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "10m"
|
|
||||||
limits:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "100m"
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -ec
|
|
||||||
- |
|
|
||||||
sqlite3 -cmd ".timeout 30000" /data/gitea/gitea.db "
|
|
||||||
UPDATE \"user\"
|
|
||||||
SET is_active = 1,
|
|
||||||
prohibit_login = 0,
|
|
||||||
updated_unix = unixepoch()
|
|
||||||
WHERE lower(email) = lower('ab@hexor.cy')
|
|
||||||
AND (is_active <> 1 OR prohibit_login <> 0);
|
|
||||||
|
|
||||||
SELECT printf(
|
|
||||||
'gitea user watchdog: id=%d login=%s email=%s is_active=%d prohibit_login=%d updated_unix=%d',
|
|
||||||
id, lower_name, email, is_active, prohibit_login, updated_unix
|
|
||||||
)
|
|
||||||
FROM \"user\"
|
|
||||||
WHERE lower(email) = lower('ab@hexor.cy');
|
|
||||||
"
|
|
||||||
volumeMounts:
|
|
||||||
- name: storage
|
|
||||||
mountPath: /data
|
|
||||||
@@ -140,8 +140,6 @@ spec:
|
|||||||
{{ .furumi_dev }}
|
{{ .furumi_dev }}
|
||||||
USER_keycloak: |-
|
USER_keycloak: |-
|
||||||
{{ .keycloak }}
|
{{ .keycloak }}
|
||||||
USER_amnezia_fellow: |-
|
|
||||||
{{ .amnezia_fellow }}
|
|
||||||
data:
|
data:
|
||||||
- secretKey: authentik
|
- secretKey: authentik
|
||||||
sourceRef:
|
sourceRef:
|
||||||
@@ -341,14 +339,3 @@ spec:
|
|||||||
metadataPolicy: None
|
metadataPolicy: None
|
||||||
key: 2a9deb39-ef22-433e-a1be-df1555625e22
|
key: 2a9deb39-ef22-433e-a1be-df1555625e22
|
||||||
property: fields[18].value
|
property: fields[18].value
|
||||||
- secretKey: amnezia_fellow
|
|
||||||
sourceRef:
|
|
||||||
storeRef:
|
|
||||||
name: vaultwarden-login
|
|
||||||
kind: ClusterSecretStore
|
|
||||||
remoteRef:
|
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
metadataPolicy: None
|
|
||||||
key: 2a9deb39-ef22-433e-a1be-df1555625e22
|
|
||||||
property: fields[19].value
|
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: Middleware
|
|
||||||
metadata:
|
|
||||||
name: auth-proxy
|
|
||||||
spec:
|
|
||||||
forwardAuth:
|
|
||||||
address: http://auth-proxy.auth-proxy.svc:80/auth
|
|
||||||
trustForwardHeader: true
|
|
||||||
authResponseHeaders:
|
|
||||||
- X-Auth-Request-User
|
|
||||||
- X-Auth-Request-Email
|
|
||||||
- X-Auth-Request-Groups
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: prometheus
|
|
||||||
annotations:
|
|
||||||
cert-manager.io/cluster-issuer: letsencrypt
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`prom.hexor.cy`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: auth-proxy
|
|
||||||
services:
|
|
||||||
- name: prometheus-kube-prometheus-prometheus
|
|
||||||
port: 9090
|
|
||||||
tls:
|
|
||||||
secretName: prometheus-tls
|
|
||||||
---
|
|
||||||
apiVersion: cert-manager.io/v1
|
|
||||||
kind: Certificate
|
|
||||||
metadata:
|
|
||||||
name: prometheus-tls
|
|
||||||
spec:
|
|
||||||
secretName: prometheus-tls
|
|
||||||
issuerRef:
|
|
||||||
name: letsencrypt
|
|
||||||
kind: ClusterIssuer
|
|
||||||
dnsNames:
|
|
||||||
- prom.hexor.cy
|
|
||||||
@@ -4,7 +4,6 @@ kind: Kustomization
|
|||||||
resources:
|
resources:
|
||||||
- persistentVolume.yaml
|
- persistentVolume.yaml
|
||||||
- external-secrets.yaml
|
- external-secrets.yaml
|
||||||
- ingress.yaml
|
|
||||||
- grafana-alerting-configmap.yaml
|
- grafana-alerting-configmap.yaml
|
||||||
- alertmanager-config.yaml
|
- alertmanager-config.yaml
|
||||||
- dashboards/telemt-dashboard-cm.yaml
|
- dashboards/telemt-dashboard-cm.yaml
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ alertmanager:
|
|||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: true
|
||||||
ingressClassName: traefik
|
ingressClassName: traefik
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt
|
cert-manager.io/cluster-issuer: letsencrypt
|
||||||
|
|||||||
@@ -16,10 +16,6 @@ proxy_applications = {
|
|||||||
domain = "pass.hexor.cy"
|
domain = "pass.hexor.cy"
|
||||||
allowed_groups = ["hexor-admin", "app-pass"]
|
allowed_groups = ["hexor-admin", "app-pass"]
|
||||||
}
|
}
|
||||||
Prometheus = {
|
|
||||||
domain = "prom.hexor.cy"
|
|
||||||
allowed_groups = ["hexor-admin"]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
oauth2_applications = {
|
oauth2_applications = {
|
||||||
@@ -95,9 +91,4 @@ oauth2_applications = {
|
|||||||
web_origins = ["https://auth.matrix.hexor.cy"]
|
web_origins = ["https://auth.matrix.hexor.cy"]
|
||||||
post_logout_redirect_uris = ["https://auth.matrix.hexor.cy/*"]
|
post_logout_redirect_uris = ["https://auth.matrix.hexor.cy/*"]
|
||||||
}
|
}
|
||||||
Amnezia-Fellow = {
|
|
||||||
redirect_uris = ["https://awg.hexor.cy/auth/oidc/callback"]
|
|
||||||
web_origins = ["https://awg.hexor.cy"]
|
|
||||||
post_logout_redirect_uris = ["https://awg.hexor.cy/*"]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user