Compare commits
1 Commits
auto-updat
...
auto-updat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce5b702eef |
@@ -1,32 +1,12 @@
|
|||||||
FROM --platform=$BUILDPLATFORM debian:bookworm-slim AS builder
|
FROM debian:bookworm-slim AS builder
|
||||||
|
|
||||||
ARG TARGETARCH
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
git curl make gcc libssl-dev zlib1g-dev \
|
git curl build-essential libssl-dev zlib1g-dev \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN if [ "$(dpkg --print-architecture)" != "$TARGETARCH" ]; then \
|
|
||||||
dpkg --add-architecture $TARGETARCH && \
|
|
||||||
apt-get update && \
|
|
||||||
case "$TARGETARCH" in \
|
|
||||||
arm64) apt-get install -y gcc-aarch64-linux-gnu libssl-dev:arm64 zlib1g-dev:arm64 ;; \
|
|
||||||
amd64) apt-get install -y gcc-x86-64-linux-gnu libssl-dev:amd64 zlib1g-dev:amd64 ;; \
|
|
||||||
esac && \
|
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
RUN git clone https://github.com/TelegramMessenger/MTProxy.git /src
|
RUN git clone https://github.com/TelegramMessenger/MTProxy.git /src
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
RUN make -j$(nproc)
|
||||||
RUN NATIVE=$(dpkg --print-architecture) && \
|
|
||||||
if [ "$NATIVE" != "$TARGETARCH" ]; then \
|
|
||||||
case "$TARGETARCH" in \
|
|
||||||
arm64) export CC=aarch64-linux-gnu-gcc ;; \
|
|
||||||
amd64) export CC=x86_64-linux-gnu-gcc ;; \
|
|
||||||
esac; \
|
|
||||||
fi && \
|
|
||||||
make -j$(nproc)
|
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
|
|||||||
@@ -44,16 +44,11 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: tgproxy-secret
|
name: tgproxy-secret
|
||||||
key: PORT
|
key: PORT
|
||||||
volumeMounts:
|
|
||||||
- name: data
|
|
||||||
mountPath: /data
|
|
||||||
command:
|
command:
|
||||||
- /bin/bash
|
- /bin/bash
|
||||||
- -c
|
- -c
|
||||||
- |
|
- |
|
||||||
set -e
|
set -e
|
||||||
curl -s https://core.telegram.org/getProxySecret -o /data/proxy-secret
|
|
||||||
curl -s https://core.telegram.org/getProxyConfig -o /data/proxy-multi.conf
|
|
||||||
NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
|
NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
|
||||||
SERVER=$(kubectl get node "${NODE_NAME}" -o jsonpath='{.metadata.labels.mtproxy}')
|
SERVER=$(kubectl get node "${NODE_NAME}" -o jsonpath='{.metadata.labels.mtproxy}')
|
||||||
if [ -z "${SERVER}" ]; then
|
if [ -z "${SERVER}" ]; then
|
||||||
@@ -72,8 +67,7 @@ spec:
|
|||||||
echo "Done"
|
echo "Done"
|
||||||
containers:
|
containers:
|
||||||
- name: mtproxy
|
- name: mtproxy
|
||||||
image: telegrammessenger/proxy:latest
|
image: ultradesu/mtproxy:v0.02
|
||||||
# image: ultradesu/mtproxy:v0.02
|
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
ports:
|
ports:
|
||||||
- name: proxy
|
- name: proxy
|
||||||
@@ -89,8 +83,8 @@ spec:
|
|||||||
-H $(PORT)
|
-H $(PORT)
|
||||||
-M 1
|
-M 1
|
||||||
-S $(SECRET)
|
-S $(SECRET)
|
||||||
--aes-pwd /data/proxy-secret
|
--aes-pwd /etc/mtproxy/proxy-secret
|
||||||
/data/proxy-multi.conf
|
/etc/mtproxy/proxy-multi.conf
|
||||||
env:
|
env:
|
||||||
- name: SECRET
|
- name: SECRET
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|||||||
@@ -6,6 +6,5 @@ resources:
|
|||||||
- ./rbac.yaml
|
- ./rbac.yaml
|
||||||
- ./daemonset.yaml
|
- ./daemonset.yaml
|
||||||
- ./external-secrets.yaml
|
- ./external-secrets.yaml
|
||||||
- ./service.yaml
|
|
||||||
- ./secret-reader.yaml
|
|
||||||
# - ./storage.yaml
|
# - ./storage.yaml
|
||||||
|
# - ./service.yaml
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: secret-reader
|
|
||||||
labels:
|
|
||||||
app: secret-reader
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: secret-reader
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: secret-reader
|
|
||||||
spec:
|
|
||||||
serviceAccountName: mtproxy
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/os: linux
|
|
||||||
containers:
|
|
||||||
- name: secret-reader
|
|
||||||
image: ultradesu/k8s-secrets:0.2.1
|
|
||||||
imagePullPolicy: Always
|
|
||||||
args:
|
|
||||||
- "--secrets"
|
|
||||||
- "mtproxy-links"
|
|
||||||
- "--namespace"
|
|
||||||
- "mtproxy"
|
|
||||||
- "--port"
|
|
||||||
- "3000"
|
|
||||||
ports:
|
|
||||||
- containerPort: 3000
|
|
||||||
name: http
|
|
||||||
env:
|
|
||||||
- name: RUST_LOG
|
|
||||||
value: "info"
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "64Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
limits:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "150m"
|
|
||||||
livenessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /health
|
|
||||||
port: http
|
|
||||||
initialDelaySeconds: 10
|
|
||||||
periodSeconds: 10
|
|
||||||
readinessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /health
|
|
||||||
port: http
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
periodSeconds: 5
|
|
||||||
securityContext:
|
|
||||||
runAsNonRoot: true
|
|
||||||
runAsUser: 1000
|
|
||||||
allowPrivilegeEscalation: false
|
|
||||||
readOnlyRootFilesystem: true
|
|
||||||
capabilities:
|
|
||||||
drop:
|
|
||||||
- ALL
|
|
||||||
@@ -2,15 +2,15 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: secret-reader
|
name: mtproxy
|
||||||
labels:
|
|
||||||
app: secret-reader
|
|
||||||
spec:
|
spec:
|
||||||
type: ClusterIP
|
type: LoadBalancer
|
||||||
selector:
|
selector:
|
||||||
app: secret-reader
|
app: mtproxy
|
||||||
ports:
|
ports:
|
||||||
- port: 80
|
- name: proxy
|
||||||
targetPort: 3000
|
port: 30443
|
||||||
|
targetPort: 30443
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
name: http
|
nodePort: 30443
|
||||||
|
|
||||||
|
|||||||
@@ -54,8 +54,6 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- containerPort: 5678
|
- containerPort: 5678
|
||||||
name: http
|
name: http
|
||||||
- containerPort: 5679
|
|
||||||
name: task-broker
|
|
||||||
env:
|
env:
|
||||||
- name: PATH
|
- name: PATH
|
||||||
value: "/opt/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
value: "/opt/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
@@ -75,10 +73,6 @@ spec:
|
|||||||
value: "true"
|
value: "true"
|
||||||
- name: N8N_RUNNERS_MODE
|
- name: N8N_RUNNERS_MODE
|
||||||
value: "external"
|
value: "external"
|
||||||
- name: N8N_RUNNERS_BROKER_LISTEN_ADDRESS
|
|
||||||
value: "0.0.0.0"
|
|
||||||
- name: N8N_RUNNERS_BROKER_PORT
|
|
||||||
value: "5679"
|
|
||||||
- name: EXECUTIONS_MODE
|
- name: EXECUTIONS_MODE
|
||||||
value: "queue"
|
value: "queue"
|
||||||
- name: QUEUE_BULL_REDIS_HOST
|
- name: QUEUE_BULL_REDIS_HOST
|
||||||
@@ -133,18 +127,18 @@ spec:
|
|||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: http
|
port: http
|
||||||
initialDelaySeconds: 240
|
initialDelaySeconds: 120
|
||||||
periodSeconds: 30
|
periodSeconds: 30
|
||||||
timeoutSeconds: 20
|
timeoutSeconds: 10
|
||||||
failureThreshold: 10
|
failureThreshold: 6
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz/readiness
|
path: /healthz/readiness
|
||||||
port: http
|
port: http
|
||||||
initialDelaySeconds: 120
|
initialDelaySeconds: 60
|
||||||
periodSeconds: 10
|
periodSeconds: 10
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
failureThreshold: 15
|
failureThreshold: 10
|
||||||
volumes:
|
volumes:
|
||||||
- name: n8n-data
|
- name: n8n-data
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: n8n-runner
|
|
||||||
labels:
|
|
||||||
app: n8n
|
|
||||||
component: runner
|
|
||||||
spec:
|
|
||||||
replicas: 2
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: n8n
|
|
||||||
component: runner
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: n8n
|
|
||||||
component: runner
|
|
||||||
spec:
|
|
||||||
serviceAccountName: n8n
|
|
||||||
containers:
|
|
||||||
- name: n8n-runner
|
|
||||||
image: docker.n8n.io/n8nio/n8n:latest
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -c
|
|
||||||
- /usr/local/bin/task-runner-launcher javascript
|
|
||||||
env:
|
|
||||||
- name: PATH
|
|
||||||
value: "/opt/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
|
||||||
- name: HOME
|
|
||||||
value: "/home/node"
|
|
||||||
- name: N8N_RUNNERS_TASK_BROKER_URI
|
|
||||||
value: "n8n:5679"
|
|
||||||
- name: N8N_RUNNERS_MODE
|
|
||||||
value: "external"
|
|
||||||
- name: N8N_RUNNERS_MAX_CONCURRENCY
|
|
||||||
value: "10"
|
|
||||||
- name: N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT
|
|
||||||
value: "30"
|
|
||||||
- name: NODE_OPTIONS
|
|
||||||
value: "--max-old-space-size=1024"
|
|
||||||
- name: GENERIC_TIMEZONE
|
|
||||||
value: "Europe/Moscow"
|
|
||||||
- name: TZ
|
|
||||||
value: "Europe/Moscow"
|
|
||||||
- name: N8N_RUNNERS_AUTH_TOKEN
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: credentials
|
|
||||||
key: runnertoken
|
|
||||||
volumeMounts:
|
|
||||||
- name: n8n-data
|
|
||||||
mountPath: /home/node/.n8n
|
|
||||||
- name: tools
|
|
||||||
mountPath: /opt/tools
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 500m
|
|
||||||
memory: 512Mi
|
|
||||||
limits:
|
|
||||||
cpu: 2000m
|
|
||||||
memory: 2048Mi
|
|
||||||
livenessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /healthz
|
|
||||||
port: 5680
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
periodSeconds: 30
|
|
||||||
timeoutSeconds: 5
|
|
||||||
failureThreshold: 3
|
|
||||||
readinessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /healthz
|
|
||||||
port: 5680
|
|
||||||
initialDelaySeconds: 15
|
|
||||||
periodSeconds: 10
|
|
||||||
timeoutSeconds: 5
|
|
||||||
failureThreshold: 3
|
|
||||||
volumes:
|
|
||||||
- name: n8n-data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: n8n-data
|
|
||||||
- name: tools
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: n8n-tools
|
|
||||||
securityContext:
|
|
||||||
runAsUser: 1000
|
|
||||||
runAsGroup: 1000
|
|
||||||
runAsNonRoot: true
|
|
||||||
fsGroup: 1000
|
|
||||||
@@ -36,10 +36,6 @@ spec:
|
|||||||
value: "true"
|
value: "true"
|
||||||
- name: N8N_RUNNERS_MODE
|
- name: N8N_RUNNERS_MODE
|
||||||
value: "external"
|
value: "external"
|
||||||
- name: N8N_RUNNERS_BROKER_LISTEN_ADDRESS
|
|
||||||
value: "0.0.0.0"
|
|
||||||
- name: N8N_RUNNERS_BROKER_PORT
|
|
||||||
value: "5679"
|
|
||||||
- name: N8N_PORT
|
- name: N8N_PORT
|
||||||
value: "80"
|
value: "80"
|
||||||
- name: EXECUTIONS_MODE
|
- name: EXECUTIONS_MODE
|
||||||
|
|||||||
@@ -7,11 +7,8 @@ resources:
|
|||||||
- rbac.yaml
|
- rbac.yaml
|
||||||
- redis-deployment.yaml
|
- redis-deployment.yaml
|
||||||
- redis-service.yaml
|
- redis-service.yaml
|
||||||
- paddleocr-deployment.yaml
|
|
||||||
- paddleocr-service.yaml
|
|
||||||
- deployment-main.yaml
|
- deployment-main.yaml
|
||||||
# - deployment-worker.yaml
|
- deployment-worker.yaml
|
||||||
- deployment-runner.yaml
|
|
||||||
- service.yaml
|
- service.yaml
|
||||||
- ingress.yaml
|
- ingress.yaml
|
||||||
|
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: paddleocr
|
|
||||||
labels:
|
|
||||||
app: paddleocr
|
|
||||||
component: n8n
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: paddleocr
|
|
||||||
component: n8n
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: paddleocr
|
|
||||||
component: n8n
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: paddleocr
|
|
||||||
image: c403/paddleocr
|
|
||||||
ports:
|
|
||||||
- containerPort: 5000
|
|
||||||
name: http
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 200m
|
|
||||||
memory: 512Mi
|
|
||||||
limits:
|
|
||||||
cpu: 1000m
|
|
||||||
memory: 2Gi
|
|
||||||
livenessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: 5000
|
|
||||||
initialDelaySeconds: 60
|
|
||||||
periodSeconds: 30
|
|
||||||
readinessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: 5000
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
periodSeconds: 10
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: paddleocr
|
|
||||||
labels:
|
|
||||||
app: paddleocr
|
|
||||||
component: n8n
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: paddleocr
|
|
||||||
component: n8n
|
|
||||||
ports:
|
|
||||||
- name: http
|
|
||||||
port: 80
|
|
||||||
targetPort: 5000
|
|
||||||
protocol: TCP
|
|
||||||
type: ClusterIP
|
|
||||||
@@ -14,8 +14,4 @@ spec:
|
|||||||
port: 80
|
port: 80
|
||||||
targetPort: 5678
|
targetPort: 5678
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
- name: task-broker
|
|
||||||
port: 5679
|
|
||||||
targetPort: 5679
|
|
||||||
protocol: TCP
|
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
@@ -60,23 +60,7 @@ EOT
|
|||||||
create_group = true
|
create_group = true
|
||||||
access_groups = ["admins"]
|
access_groups = ["admins"]
|
||||||
}
|
}
|
||||||
"mtproxy-links" = {
|
|
||||||
name = "mtproxy-links"
|
|
||||||
slug = "mtproxy-links"
|
|
||||||
group = "Core"
|
|
||||||
external_host = "https://proxy.hexor.cy"
|
|
||||||
internal_host = "http://secret-reader.mtproxy.svc:80"
|
|
||||||
internal_host_ssl_validation = false
|
|
||||||
meta_description = ""
|
|
||||||
skip_path_regex = <<-EOT
|
|
||||||
/webhook
|
|
||||||
EOT
|
|
||||||
meta_icon = "https://img.icons8.com/ios-filled/50/password.png"
|
|
||||||
mode = "proxy"
|
|
||||||
outpost = "kubernetes-outpost"
|
|
||||||
create_group = true
|
|
||||||
access_groups = ["admins"]
|
|
||||||
}
|
|
||||||
# Tools applications
|
# Tools applications
|
||||||
"vpn" = {
|
"vpn" = {
|
||||||
name = "VPN"
|
name = "VPN"
|
||||||
|
|||||||
Reference in New Issue
Block a user