From 01f192f91aca0906777239a3fcdb1f9745850ef3 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Wed, 14 Jan 2026 09:21:08 -0300 Subject: [PATCH] update worker versioning and settings for cluster compatibility --- cluster/cluster_api.py | 3 +-- cluster/views.py | 3 ++- containers/cluster_node/cluster_worker.py | 4 ++-- wireguard_webadmin/settings.py | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cluster/cluster_api.py b/cluster/cluster_api.py index 4349a07..0b5c5f7 100644 --- a/cluster/cluster_api.py +++ b/cluster/cluster_api.py @@ -33,7 +33,6 @@ def get_cluster_settings(): def get_worker(request): - min_worker_version = 1 success = True ip_address = get_ip_address(request) token = request.GET.get('token', '') @@ -56,7 +55,7 @@ def get_worker(request): worker.error_status = '' worker.save() - if worker_version < min_worker_version: + if worker_version < settings.CLUSTER_WORKER_MINIMUM_VERSION: worker.error_status = 'update_required' worker.save() return worker, False diff --git a/cluster/views.py b/cluster/views.py index fc029e0..e318fb8 100644 --- a/cluster/views.py +++ b/cluster/views.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, redirect, render @@ -21,7 +22,7 @@ def cluster_main(request): context = { 'page_title': page_title, 'workers': workers, - 'current_worker_version': 10, + 'current_worker_version': settings.CLUSTER_WORKER_CURRENT_VERSION, 'cluster_settings': cluster_settings } return render(request, 'cluster/workers_list.html', context) diff --git a/containers/cluster_node/cluster_worker.py b/containers/cluster_node/cluster_worker.py index ec9c1b3..b441036 100644 --- a/containers/cluster_node/cluster_worker.py +++ b/containers/cluster_node/cluster_worker.py @@ -19,8 +19,8 @@ MASTER_SERVER_ADDRESS = os.environ.get('MASTER_SERVER_ADDRESS') TOKEN = os.environ.get('TOKEN') WIREGUARD_DIR = '/etc/wireguard' DNS_DIR = '/etc/dnsmasq' -WORKER_VERSION = 10 -REQUEST_TIMEOUT = 10 +WORKER_VERSION = 11 +REQUEST_TIMEOUT = 20 class ClusterWorker: def __init__(self): diff --git a/wireguard_webadmin/settings.py b/wireguard_webadmin/settings.py index 87fdd51..98961d2 100644 --- a/wireguard_webadmin/settings.py +++ b/wireguard_webadmin/settings.py @@ -170,4 +170,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' WIREGUARD_WEBADMIN_VERSION = 9970 +CLUSTER_WORKER_CURRENT_VERSION = 11 +CLUSTER_WORKER_MINIMUM_VERSION = 11 + from wireguard_webadmin.production_settings import *