fix k8s things

This commit is contained in:
2024-03-18 22:08:43 +02:00
parent 5c1ffcbdc3
commit f6a728ef1a
3 changed files with 92 additions and 78 deletions

2
k8s.py
View File

@ -67,7 +67,7 @@ try:
CONFIG = yaml.safe_load(V1.read_namespaced_config_map(name="config-outfleet", namespace=NAMESPACE).data['config.yaml']) CONFIG = yaml.safe_load(V1.read_namespaced_config_map(name="config-outfleet", namespace=NAMESPACE).data['config.yaml'])
log.info("Created new ConfigMap [config-outfleet]") log.info("Created new ConfigMap [config-outfleet]")
except Exception as e: except Exception as e:
log.info("Failed to create new ConfigMap [config-outfleet] {e}") log.info(f"Failed to create new ConfigMap [config-outfleet] {e}")
except: except:
log.info("Kubernetes environment not detected") log.info("Kubernetes environment not detected")
except: except:

View File

@ -36,7 +36,7 @@ NAMESPACE = k8s.NAMESPACE
SERVERS = list() SERVERS = list()
BROKEN_SERVERS = list() BROKEN_SERVERS = list()
CLIENTS = dict() CLIENTS = dict()
VERSION = '3' VERSION = '4'
HOSTNAME = "" HOSTNAME = ""
app = Flask(__name__) app = Flask(__name__)
CORS(app) CORS(app)
@ -64,7 +64,6 @@ def update_state():
CLIENTS = dict() CLIENTS = dict()
config = get_config() config = get_config()
if config: if config:
HOSTNAME = config.get("ui_hostname", "my-own-SSL-ENABLED-domain.com") HOSTNAME = config.get("ui_hostname", "my-own-SSL-ENABLED-domain.com")
servers = config.get("servers", dict()) servers = config.get("servers", dict())
@ -101,6 +100,7 @@ def index():
"index.html", "index.html",
SERVERS=SERVERS, SERVERS=SERVERS,
VERSION=VERSION, VERSION=VERSION,
K8S_NAMESPACE=k8s.NAMESPACE,
BROKEN_SERVERS=BROKEN_SERVERS, BROKEN_SERVERS=BROKEN_SERVERS,
nt=request.args.get("nt"), nt=request.args.get("nt"),
nl=request.args.get("nl"), nl=request.args.get("nl"),
@ -135,6 +135,7 @@ def clients():
SERVERS=SERVERS, SERVERS=SERVERS,
CLIENTS=CLIENTS, CLIENTS=CLIENTS,
VERSION=VERSION, VERSION=VERSION,
K8S_NAMESPACE=k8s.NAMESPACE,
nt=request.args.get("nt"), nt=request.args.get("nt"),
nl=request.args.get("nl"), nl=request.args.get("nl"),
selected_client=request.args.get("selected_client"), selected_client=request.args.get("selected_client"),

File diff suppressed because one or more lines are too long