From dd5b0187ed416bc18faac4de025dd42343d3e657 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Tue, 31 Mar 2026 16:44:41 -0300 Subject: [PATCH] platform: expose metis on sentinel and move gitea to rpi5 --- scripts/dashboards_render_atlas.py | 6 +++--- services/gitea/deployment.yaml | 12 +++++++++--- services/maintenance/metis-configmap.yaml | 2 +- services/maintenance/metis-ingress.yaml | 12 +++++++++++- services/monitoring/dashboards/atlas-jobs.json | 4 ++-- services/monitoring/dashboards/atlas-overview.json | 2 +- services/monitoring/grafana-dashboard-jobs.yaml | 4 ++-- services/monitoring/grafana-dashboard-overview.yaml | 2 +- 8 files changed, 30 insertions(+), 14 deletions(-) diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py index 1b2c270a..9b949492 100644 --- a/scripts/dashboards_render_atlas.py +++ b/scripts/dashboards_render_atlas.py @@ -1303,7 +1303,7 @@ def build_overview(): ) test_success["description"] = ( "Atlas Overview mirrors the Atlas Jobs internal dashboard for automation test health. " - "Add new test series there first so they roll up here." + "This panel rolls up the shared Ariadne and Metis CI metrics from that internal dashboard." ) panels.append(test_success) test_failures = bargauge_panel( @@ -2669,7 +2669,7 @@ def build_jobs_dashboard(): panels.append(coverage_panel) tests_panel = table_panel( 18, - "Platform CI Tests (latest)", + "Platform CI Tests (Ariadne + Metis)", TEST_CI_TESTS, {"h": 6, "w": 12, "x": 12, "y": 11}, unit="none", @@ -2677,7 +2677,7 @@ def build_jobs_dashboard(): instant=True, ) tests_panel["description"] = ( - "Atlas Overview test panels depend on these internal repo-tagged CI series." + "Atlas Overview test panels depend on these internal repo-tagged CI series from Ariadne and Metis." ) panels.append(tests_panel) diff --git a/services/gitea/deployment.yaml b/services/gitea/deployment.yaml index da188c35..be5be132 100644 --- a/services/gitea/deployment.yaml +++ b/services/gitea/deployment.yaml @@ -122,14 +122,20 @@ spec: - matchExpressions: - key: hardware operator: In - values: ["rpi4","rpi5"] + values: ["rpi5"] preferredDuringSchedulingIgnoredDuringExecution: - - weight: 50 + - weight: 100 preference: matchExpressions: - key: hardware operator: In - values: ["rpi4"] + values: ["rpi5"] + - weight: 100 + preference: + matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: ["titan-20","titan-21"] containers: - name: gitea image: gitea/gitea:1.23 diff --git a/services/maintenance/metis-configmap.yaml b/services/maintenance/metis-configmap.yaml index 5e6af487..0b0e6444 100644 --- a/services/maintenance/metis-configmap.yaml +++ b/services/maintenance/metis-configmap.yaml @@ -11,7 +11,7 @@ data: METIS_DEFAULT_FLASH_HOST: titan-22 METIS_FLASH_HOSTS: titan-22 METIS_LOCAL_HOST: titan-22 - METIS_ALLOWED_GROUPS: admin,maintainer + METIS_ALLOWED_GROUPS: admin,maintenance,maintainer METIS_MAX_DEVICE_BYTES: "300000000000" METIS_SENTINEL_PUSH_URL: http://metis.maintenance.svc.cluster.local/internal/sentinel/snapshot METIS_SENTINEL_INTERVAL_SEC: "1800" diff --git a/services/maintenance/metis-ingress.yaml b/services/maintenance/metis-ingress.yaml index 468584c5..40799b06 100644 --- a/services/maintenance/metis-ingress.yaml +++ b/services/maintenance/metis-ingress.yaml @@ -13,7 +13,7 @@ metadata: spec: ingressClassName: traefik tls: - - hosts: ["metis.bstein.dev"] + - hosts: ["metis.bstein.dev", "sentinel.bstein.dev"] secretName: metis-tls rules: - host: metis.bstein.dev @@ -26,3 +26,13 @@ spec: name: metis port: number: 80 + - host: sentinel.bstein.dev + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: metis + port: + number: 80 diff --git a/services/monitoring/dashboards/atlas-jobs.json b/services/monitoring/dashboards/atlas-jobs.json index be633f69..b0a7307a 100644 --- a/services/monitoring/dashboards/atlas-jobs.json +++ b/services/monitoring/dashboards/atlas-jobs.json @@ -1189,7 +1189,7 @@ { "id": 18, "type": "table", - "title": "Platform CI Tests (latest)", + "title": "Platform CI Tests (Ariadne + Metis)", "datasource": { "type": "prometheus", "uid": "atlas-vm" @@ -1235,7 +1235,7 @@ } } ], - "description": "Atlas Overview test panels depend on these internal repo-tagged CI series." + "description": "Atlas Overview test panels depend on these internal repo-tagged CI series from Ariadne and Metis." } ], "time": { diff --git a/services/monitoring/dashboards/atlas-overview.json b/services/monitoring/dashboards/atlas-overview.json index 8a24e635..6e634610 100644 --- a/services/monitoring/dashboards/atlas-overview.json +++ b/services/monitoring/dashboards/atlas-overview.json @@ -1710,7 +1710,7 @@ "mode": "multi" } }, - "description": "Atlas Overview mirrors the Atlas Jobs internal dashboard for automation test health. Add new test series there first so they roll up here." + "description": "Atlas Overview mirrors the Atlas Jobs internal dashboard for automation test health. This panel rolls up the shared Ariadne and Metis CI metrics from that internal dashboard." }, { "id": 43, diff --git a/services/monitoring/grafana-dashboard-jobs.yaml b/services/monitoring/grafana-dashboard-jobs.yaml index af6f2652..9f37d00c 100644 --- a/services/monitoring/grafana-dashboard-jobs.yaml +++ b/services/monitoring/grafana-dashboard-jobs.yaml @@ -1198,7 +1198,7 @@ data: { "id": 18, "type": "table", - "title": "Platform CI Tests (latest)", + "title": "Platform CI Tests (Ariadne + Metis)", "datasource": { "type": "prometheus", "uid": "atlas-vm" @@ -1244,7 +1244,7 @@ data: } } ], - "description": "Atlas Overview test panels depend on these internal repo-tagged CI series." + "description": "Atlas Overview test panels depend on these internal repo-tagged CI series from Ariadne and Metis." } ], "time": { diff --git a/services/monitoring/grafana-dashboard-overview.yaml b/services/monitoring/grafana-dashboard-overview.yaml index a5ae7719..fea1544d 100644 --- a/services/monitoring/grafana-dashboard-overview.yaml +++ b/services/monitoring/grafana-dashboard-overview.yaml @@ -1719,7 +1719,7 @@ data: "mode": "multi" } }, - "description": "Atlas Overview mirrors the Atlas Jobs internal dashboard for automation test health. Add new test series there first so they roll up here." + "description": "Atlas Overview mirrors the Atlas Jobs internal dashboard for automation test health. This panel rolls up the shared Ariadne and Metis CI metrics from that internal dashboard." }, { "id": 43,