Watch
0
0
Fork
You've already forked hyperhive
0

move the small per-service host options to deploy.<service>

This commit is contained in:
atlas 2026-10-29 01:48:34 +01:00 • committed by mara
commit 525de62b06

View file

@ -155,7 +155,7 @@ let
taken = [
8888
8890
h.services.hyperhive.swarm.nats.otel.telemetryPort
h.services.hyperhive.deploy.nats.otel.telemetryPort
]
++ map (o: o.port) (lib.filter (o: o.machine != svc.machine) forwarderServices);
in
@ -265,7 +265,7 @@ let
taken = [
8888
8890
h.services.hyperhive.swarm.nats.otel.telemetryPort
h.services.hyperhive.deploy.nats.otel.telemetryPort
]
++ map (o: o.port) (lib.filter (o: o.machine != svc.machine) hostNetnsForwarders);
in
@ -737,7 +737,7 @@ let
&& s.extensions."oauth2client/swarm".endpoint_params.audience == clientId
&& lib.elem "oauth2client/swarm" s.service.extensions
&& s.service.pipelines.logs.receivers == [ "journald" ]
&& selfScrapes s h.services.hyperhive.swarm.nats.otel.telemetryPort { container = "nats"; }
&& selfScrapes s h.services.hyperhive.deploy.nats.otel.telemetryPort { container = "nats"; }
&& lib.elem "oidc-client-secret:/run/swarm-journal-forwarder-oidc/client-secret" c.systemd.services.opentelemetry-collector.serviceConfig.LoadCredential
&& fetch.environment.BAO_CLIENT_CERT == "/var/lib/swarm-nats-auth/bao-client.pem"
&& lib.hasInfix "bao kv get -field=value secret/swarm/services/${clientId}/oidc/client" fetch.script
@ -999,7 +999,7 @@ let
taken = [
8888
8890
h.services.hyperhive.swarm.nats.otel.telemetryPort
h.services.hyperhive.deploy.nats.otel.telemetryPort
]
++ map (o: o.port) hostNetnsForwarders;
in