diff --git a/argos/configmaps/configmap-panel.yaml.old b/argos/configmaps/configmap-panel.yaml.old deleted file mode 100644 index 4404c50..0000000 --- a/argos/configmaps/configmap-panel.yaml.old +++ /dev/null @@ -1,87 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argos-panel-config - namespace: argos-core -data: - app.py: | - import os, sqlite3, time - from fastapi import FastAPI, HTTPException - from fastapi.responses import HTMLResponse - from minio import Minio - from urllib.parse import urlparse - - DB="/data/argos.db" - mc=Minio(os.getenv("MINIO_ENDPOINT","s3.argos.interna"), - access_key=os.getenv("MINIO_ACCESS_KEY"), - secret_key=os.getenv("MINIO_SECRET_KEY"), - secure=os.getenv("MINIO_SECURE","false").lower()=="true") - app=FastAPI() - - def rows(limit=100, camera=None, since=None): - q="SELECT id, ts, edge, camera, label, s3url, thumb_s3 FROM events" - cond=[]; args=[] - if camera: cond.append("camera=?"); args.append(camera) - if since: cond.append("ts>=?"); args.append(int(since)) - if cond: q+=" WHERE "+ " AND ".join(cond) - q+=" ORDER BY ts DESC LIMIT ?"; args.append(limit) - con=sqlite3.connect(DB); cur=con.cursor() - cur.execute(q, tuple(args)); r=cur.fetchall(); con.close() - return r - - @app.get("/api/events") - def api_events(limit:int=100, camera:str=None, since:int=None): - return [dict(id=i, ts=t, edge=e, camera=c, label=l or "", s3url=s, thumb=th or "") - for (i,t,e,c,l,s,th) in rows(limit,camera,since)] - - @app.get("/api/url/{event_id}") - def presign(event_id: str, expires: int = 600): - con=sqlite3.connect(DB); cur=con.cursor() - cur.execute("SELECT s3url FROM events WHERE id=?", (event_id,)) - row=cur.fetchone(); con.close() - if not row: raise HTTPException(404, "Not found") - s3url=row[0]; p=urlparse(s3url); b=p.netloc; k=p.path.lstrip("/") - return {"url": mc.presigned_get_object(b, k, expires=expires)} - - @app.get("/", response_class=HTMLResponse) - def index(): - return """ - ARGOS Panel - -

ARGOS – Alarmas

-
-
- - """ diff --git a/argos/deployments/deploy-mosquitto.yaml b/argos/deployments/deploy-mosquitto.yaml index 75d1a94..c342d5f 100644 --- a/argos/deployments/deploy-mosquitto.yaml +++ b/argos/deployments/deploy-mosquitto.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mosquitto - image: eclipse-mosquitto:2 + image: eclipse-mosquitto:latest ports: - containerPort: 1883 volumeMounts: diff --git a/argos/deployments/deploy-panel.yaml b/argos/deployments/deploy-panel.yaml index 8b0a99b..f921485 100644 --- a/argos/deployments/deploy-panel.yaml +++ b/argos/deployments/deploy-panel.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: panel - image: python:3.13.7-slim-bookworm + image: harbor.c2et.net/library/python:3.13.7-slim-bookworm command: ["/bin/sh","-c"] args: - | diff --git a/argos/kubectl b/argos/kubectl new file mode 100644 index 0000000..e69de29 diff --git a/coredns/configmap-coredns.yaml b/coredns/configmap-coredns.yaml index ff2ec59..e0cdfee 100644 --- a/coredns/configmap-coredns.yaml +++ b/coredns/configmap-coredns.yaml @@ -33,6 +33,9 @@ data: 192.168.0.100 admin.powervault1.c2et.net 192.168.0.100 admin.powervault2.c2et.net 192.168.0.100 ceph.c2et.net + 192.168.0.100 heimdall.c2et.net + + fallthrough } forward . /etc/resolv.conf diff --git a/guacamole/deployments/mysql-deployment.yaml b/guacamole/deployments/mysql-deployment.yaml index e1507ed..643e04a 100644 --- a/guacamole/deployments/mysql-deployment.yaml +++ b/guacamole/deployments/mysql-deployment.yaml @@ -29,6 +29,7 @@ spec: volumeMounts: - name: mysql-storage mountPath: /var/lib/mysql + subPath: data volumes: - name: mysql-storage persistentVolumeClaim: