Compare commits
254
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c4cbd87590 | ||
|
|
4c7c53e0f2 | ||
|
|
ba934265ac | ||
|
|
c7155808d9 | ||
|
|
fc4d64bdb2 | ||
|
|
a6f7fc6030 | ||
|
|
11de1d1468 | ||
|
|
64962d1a63 | ||
|
|
b08a0a927d | ||
|
|
8203ba1b0b | ||
|
|
48033b5495 | ||
|
|
73d2af73e5 | ||
|
|
64253e005e | ||
|
|
69accd1752 | ||
|
|
0cf4b08a95 | ||
|
|
86df5d9048 | ||
|
|
d7441bbbc2 | ||
|
|
2be089e048 | ||
|
|
83b2e68371 | ||
|
|
597f64cbb0 | ||
|
|
f767f3ce1a | ||
|
|
95e4d8f875 | ||
|
|
1d93588e06 | ||
|
|
fb400eea6e | ||
|
|
0c76426c17 | ||
|
|
d74822cd27 | ||
|
|
b677d553b4 | ||
|
|
898463b759 | ||
|
|
9a76529be8 | ||
|
|
5f9354b9a8 | ||
|
|
fcd16f6128 | ||
|
|
2ac2a94bb4 | ||
|
|
3c7e358dd5 | ||
|
|
9be8fb6c69 | ||
|
|
7fdeacffb8 | ||
|
|
cef499de73 | ||
|
|
1b70a55300 | ||
|
|
3f2b4e9acf | ||
|
|
6057734a4f | ||
|
|
8eedf8b74b | ||
|
|
8c0e36a5c0 | ||
|
|
78cd15f12c | ||
|
|
18c633c242 | ||
|
|
4510394531 | ||
|
|
2545312db1 | ||
|
|
8ce0b809c0 | ||
|
|
506c04e15c | ||
|
|
bdcbb3d5af | ||
|
|
faac6febb8 | ||
|
|
695da1308c | ||
|
|
552b22cb66 | ||
|
|
3756e60c95 | ||
|
|
d0d217ddf4 | ||
|
|
24f84bab2f | ||
|
|
0b8a3c16a7 | ||
|
|
e9a68aae77 | ||
|
|
5359df5ed6 | ||
|
|
8aea0f0d13 | ||
|
|
65d4f2d482 | ||
|
|
2fe9b7632f | ||
|
|
e436d89eef | ||
|
|
8729cb5062 | ||
|
|
f1e4a1088d | ||
|
|
b357ef95d8 | ||
|
|
67422663b7 | ||
|
|
88705fec88 | ||
|
|
c098807aa4 | ||
|
|
e1eee2d3c7 | ||
|
|
ff83daed1e | ||
|
|
080ae343e6 | ||
|
|
8d3185f8ab | ||
|
|
ff40a71145 | ||
|
|
cc9c3dea88 | ||
|
|
815cd85b9a | ||
|
|
9021eddbc3 | ||
|
|
2adf17c307 | ||
|
|
1add5b5cd7 | ||
|
|
34f10211ab | ||
|
|
02447f2946 | ||
|
|
8799962b1c | ||
|
|
fb80024fa2 | ||
|
|
0f1a788874 | ||
|
|
39df442e60 | ||
|
|
62a451773e | ||
|
|
f196099491 | ||
|
|
66502b8279 | ||
|
|
9018c091fa | ||
|
|
114608af2f | ||
|
|
51a73fb213 | ||
|
|
939fad4a23 | ||
|
|
12d5cc6202 | ||
|
|
a91862d288 | ||
|
|
a6b84d86b4 | ||
|
|
f2dd9b3fbc | ||
|
|
f3a5cedc80 | ||
|
|
b0282e24f3 | ||
|
|
e208ccae62 | ||
|
|
c65fee7b29 | ||
|
|
d3892d2ed5 | ||
|
|
fb025d221b | ||
|
|
7164b48275 | ||
|
|
3f484a37c6 | ||
|
|
956596e6aa | ||
|
|
3320018232 | ||
|
|
65709e005b | ||
|
|
c24bf90629 | ||
|
|
78e6363fe2 | ||
|
|
22c2f1e108 | ||
|
|
64ba4ce9f1 | ||
|
|
7a81b4ea8b | ||
|
|
0859479c0f | ||
|
|
872f64b887 | ||
|
|
a90fb19ed4 | ||
|
|
6f4cd03f4b | ||
|
|
e56662194b | ||
|
|
4856348a6e | ||
|
|
49d0da1dd0 | ||
|
|
6bc938436f | ||
|
|
04b33d0736 | ||
|
|
5dcad7eb38 | ||
|
|
d0872bc918 | ||
|
|
91dd749a29 | ||
|
|
b6e1dc0362 | ||
|
|
a2af854867 | ||
|
|
314ec0cda7 | ||
|
|
e45ae10204 | ||
|
|
357ee26111 | ||
|
|
436fd1ecae | ||
|
|
a564dd8b67 | ||
|
|
c2c90c490d | ||
|
|
da0f9e84c3 | ||
|
|
3ecc12300a | ||
|
|
19029fa012 | ||
|
|
2a5d690e34 | ||
|
|
b53ce36d89 | ||
|
|
a8c4e9bcbe | ||
|
|
761f97ef8e | ||
|
|
0c9743e241 | ||
|
|
2b3c28a46b | ||
|
|
2cb06debc5 | ||
|
|
a6af69dca0 | ||
|
|
76f39da90c | ||
|
|
86730ff0c4 | ||
|
|
af66d3e7fd | ||
|
|
deeaefa695 | ||
|
|
6999dd2728 | ||
|
|
742d78944b | ||
|
|
e451c97dfc | ||
|
|
33c54ac830 | ||
|
|
b09d718310 | ||
|
|
b4f76373bb | ||
|
|
74adf38d63 | ||
|
|
f5b2f89f38 | ||
|
|
8e63284240 | ||
|
|
1d81410cd8 | ||
|
|
2f891a5d31 | ||
|
|
cda0022d81 | ||
|
|
dde6b1c743 | ||
|
|
7c4843c88c | ||
|
|
f9e4623ade | ||
|
|
2ad4fa1b82 | ||
|
|
2a4f215546 | ||
|
|
16aaeb60c1 | ||
|
|
a5409edbf2 | ||
|
|
c70d2db3a1 | ||
|
|
24dd82e801 | ||
|
|
11e92fdf4e | ||
|
|
b1f98fc148 | ||
|
|
9b91b5847e | ||
|
|
892790822d | ||
|
|
f7cd75d65e | ||
|
|
6a9a460769 | ||
|
|
ac0f845da6 | ||
|
|
f54589a05c | ||
|
|
f49d91b63d | ||
|
|
aafa74b70a | ||
|
|
4f74fe1778 | ||
|
|
a5d384a4d8 | ||
|
|
af9a22fea9 | ||
|
|
baedea504d | ||
|
|
30995ee009 | ||
|
|
3a05d86e3e | ||
|
|
c00a4724f5 | ||
|
|
284e19ef88 | ||
|
|
0ae0df7473 | ||
|
|
fddd82704f | ||
|
|
0691536f28 | ||
|
|
2b9e34ba4a | ||
|
|
30d2b83efe | ||
|
|
db7bccfd89 | ||
|
|
1505b638ce | ||
|
|
7ce727bc8a | ||
|
|
f22793e32e | ||
|
|
4a8d4feea0 | ||
|
|
1d9a85bef9 | ||
|
|
b625d30568 | ||
|
|
d018a441af | ||
|
|
ecb254017d | ||
|
|
41f18ea993 | ||
|
|
91c344fe2c | ||
|
|
cab6ef2102 | ||
|
|
a2ff9515a3 | ||
|
|
62d39ee4f1 | ||
|
|
f1f7dd4a0a | ||
|
|
f4df6d4437 | ||
|
|
987a89f022 | ||
|
|
b423119632 | ||
|
|
ddbc0cc7e6 | ||
|
|
6ad33d75e6 | ||
|
|
11bfb426c0 | ||
|
|
b7a1835adb | ||
|
|
ad4bb8750d | ||
|
|
f1e00b946f | ||
|
|
7ee7d0c961 | ||
|
|
27ab6b859e | ||
|
|
71e769c002 | ||
|
|
16dd67c2c0 | ||
|
|
c536a16a2a | ||
|
|
a4a4bb4cc5 | ||
|
|
648b354951 | ||
|
|
b0a9b3476d | ||
|
|
ac3bf4a55a | ||
|
|
34fb6f85ba | ||
|
|
66eacd86d1 | ||
|
|
54f43fc2c7 | ||
|
|
451d0dc6b7 | ||
|
|
88ae20a543 | ||
|
|
6bd183ba73 | ||
|
|
aeefdd8560 | ||
|
|
c10d344fd7 | ||
|
|
6e5f80611b | ||
|
|
5cf0c90258 | ||
|
|
90a452a253 | ||
|
|
a9eabfba02 | ||
|
|
46c7e99b1d | ||
|
|
8b2cf29771 | ||
|
|
7b7fc3bcb0 | ||
|
|
bc1e69ebe0 | ||
|
|
f29bb3d580 | ||
|
|
1f7166026b | ||
|
|
1cbdfc1d6f | ||
|
|
6be3769288 | ||
|
|
ef325cd3b1 | ||
|
|
aa81f1bf8a | ||
|
|
93d768e988 | ||
|
|
a8f7c79934 | ||
|
|
c42bf14c9a | ||
|
|
1e8479b853 | ||
|
|
c139d700f1 | ||
|
|
67b9996911 | ||
|
|
4e9ee567ca | ||
|
|
4863e13596 | ||
|
|
9c4580a522 | ||
|
|
4e3ad00202 |
No files matched your search
@@ -0,0 +1,50 @@
|
|||||||
|
# EDU ownership handoff
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
The EDU ownership handoff is complete. The homelab repository no longer owns
|
||||||
|
EDU workloads, images, routes, alerts, or deployment selection. The EDU
|
||||||
|
repository is the only deployment owner: [forust/edu-master](https://git.forust.xyz/forust/edu-master).
|
||||||
|
|
||||||
|
Homelab PRs #99 and #105 are merged. PR #105 removed the EDU subtree and its
|
||||||
|
build, deploy, rollback, verification, route-probe, and registry references.
|
||||||
|
It also added the serial image build matrix for the homelab services. This
|
||||||
|
handoff record is the only remaining EDU-specific file in homelab Git.
|
||||||
|
|
||||||
|
The dedicated workstation checkout is `/srv/edu-master`, at release
|
||||||
|
`4f2b2a0e37dc11ac2c75441a15076c178e219d37`. It contains `k8s/active`; root
|
||||||
|
`active` is absent. The old untracked `/srv/homelab/edu_master` checkout was
|
||||||
|
moved outside the homelab repository to
|
||||||
|
`/srv/edu-master-legacy-archive-20261007/edu_master`. Its private files remain
|
||||||
|
mode `0600` inside an archive directory with mode `0700`. The homelab deploy
|
||||||
|
checkout has no EDU marker or tracked EDU application/deployment files.
|
||||||
|
`AUTODEPLOY=false` remains in place for homelab deployment.
|
||||||
|
|
||||||
|
## Release evidence
|
||||||
|
|
||||||
|
EDU PR #4 merged after its review and CI checks. Main-push CI run 1652 passed
|
||||||
|
all validation and both image builds. Deploy run 1653 passed for the exact main
|
||||||
|
SHA above.
|
||||||
|
|
||||||
|
The workstation rollout completed for both Deployments. The deployment
|
||||||
|
verified `/health` and `/live` with HTTP 200, Redis AUTH, session TTL of 1058
|
||||||
|
seconds, a delivery backlog of zero, and all nine EDU vmalert rules with
|
||||||
|
matching expressions and healthy evaluation.
|
||||||
|
|
||||||
|
The images now run by digest:
|
||||||
|
|
||||||
|
- Session keeper: `sha256:998dea51aa3015fd9cabefb0f53b030157a650c3bef72e02fe84f17d5762613d`
|
||||||
|
- Webinar checker: `sha256:92f3c1fa2bb7f9b4680a9fc76a5b33dfbea8ef3dd9c6490ebc45876fd4c54461`
|
||||||
|
|
||||||
|
Redis StatefulSet was unchanged. PVC `redis-data-pvc` remains bound to PV
|
||||||
|
`pvc-a4f2a79a-363a-4c12-ae91-92cdfc2a0d2e` with capacity 1 GiB. The existing
|
||||||
|
runtime Secret and Fernet key were preserved during the handoff. Notification
|
||||||
|
delivery was verified before closeout, as confirmed by the operator. The
|
||||||
|
deployment did not record downtime.
|
||||||
|
|
||||||
|
The release rollback snapshot is
|
||||||
|
`/home/forust/.local/state/edu-master-deploy/20261007T180541Z-4f2b2a0e37dc11ac2c75441a15076c178e219d37`.
|
||||||
|
The handoff data snapshot remains at
|
||||||
|
`/home/forust/.local/state/edu-master-deploy/handoff-20261007T080838Z`.
|
||||||
|
Both snapshots are outside Git. Do not restore old Redis data unless recovery
|
||||||
|
requires it. Never delete or recreate the Redis PVC.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# actionlint configuration. Passed explicitly from the ci workflow:
|
||||||
|
# actionlint -config-file .gitea/actionlint.yaml .gitea/workflows/*.yaml
|
||||||
|
#
|
||||||
|
# The self-hosted act_runner registers custom labels that actionlint cannot know
|
||||||
|
# about, so declare them here instead of silencing the whole runner-label check.
|
||||||
|
self-hosted-runner:
|
||||||
|
labels:
|
||||||
|
- arch
|
||||||
|
- homelab
|
||||||
|
- homelab-pr
|
||||||
|
- prod
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"postgres": ["authentik", "gitea", "immich", "n8n", "netbox", "netronome"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
# Homelab CI/CD
|
||||||
|
|
||||||
|
The native Gitea runners run on **vps**; production runs on **workstation**.
|
||||||
|
Main-branch checks and image builds use `homelab:host`. Pull request and
|
||||||
|
non-main checks use `homelab-pr:host` under a separate account without Docker
|
||||||
|
access. The `homelab-pr` runner is registered at User scope for `forust`, so
|
||||||
|
any repository under that account can schedule jobs that request this label.
|
||||||
|
Each runner accepts one job at a time; the build waits for every check to pass.
|
||||||
|
CI and deploy runs also show a summary with
|
||||||
|
the release SHA, image build or reuse results, deploy mode, selected services,
|
||||||
|
and image digests. Failed runs keep a summary of completed image builds, stage
|
||||||
|
results, apply results, and recorded Kubernetes recovery. The final deploy
|
||||||
|
summary is in the smoke job; earlier jobs show the state observed at that time.
|
||||||
|
Apply success is separate from health and recovery. Update the installed
|
||||||
|
workstation controller with `setup-workstation.sh` when no deploy is running.
|
||||||
|
No job images or Kubernetes credentials are needed on the VPS. Builds use one
|
||||||
|
pinned BuildKit helper container. CI and deploy are separate workflows.
|
||||||
|
|
||||||
|
## Runner installation
|
||||||
|
|
||||||
|
Install Docker Engine with Compose and Buildx, Git, Python 3.11+, Bash, curl,
|
||||||
|
GNU tar/xz, flock and systemd using the host's package manager. Keep the existing
|
||||||
|
Gitea runner 3.0.2 binary at `/usr/local/bin/gitea-runner`.
|
||||||
|
|
||||||
|
From this checkout on the VPS:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo bash .gitea/runner/setup-runner.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
The installer reuses `/var/lib/gitea-runner/.runner` and the existing service.
|
||||||
|
For a new host, install the same runner binary and register as `gitea-runner`
|
||||||
|
using the registration token interactively, label `homelab:host`, and working
|
||||||
|
directory `/var/lib/gitea-runner`; then rerun the installer. Tokens never belong
|
||||||
|
in this repository or command-line examples.
|
||||||
|
|
||||||
|
Pinned tools live in the runner user's `~/.cache/homelab-ci`; CI repairs version
|
||||||
|
drift there. Installations are locked. Buildx uses only the `homelab-ci` builder,
|
||||||
|
pushes directly to the registry, and caps retained local cache at 1 GiB with a
|
||||||
|
2 GiB free-space target. This is not a hard limit on peak build disk usage.
|
||||||
|
Nothing runs `docker system prune`, removes unrelated images, or deletes volumes.
|
||||||
|
|
||||||
|
### Pull request runner
|
||||||
|
|
||||||
|
Install the unprivileged host runner on the VPS:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo bash .gitea/runner/setup-pr-runner.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
Get a registration token from the user Actions runner settings. Run the
|
||||||
|
installer in a terminal. It asks for the token without echoing it, registers the
|
||||||
|
runner as `homelab-pr` with label `homelab-pr:host`, then enables the service.
|
||||||
|
The work directory is `/var/lib/gitea-pr-runner`. Confirm that Gitea lists the
|
||||||
|
runner as User scope before merging the workflow change. An unmatched label can
|
||||||
|
fall back to the default job image.
|
||||||
|
|
||||||
|
Renovate PR validation uses `pull_request_target`, which reads the workflow from
|
||||||
|
the base branch. It checks out the PR head only after runner selection and runs
|
||||||
|
that code on `homelab-pr`. Keep this workflow read-only and do not add secrets.
|
||||||
|
|
||||||
|
The PR runner has a separate home and tool cache. Do not add it to the `docker`
|
||||||
|
group or give it access to `/var/run/docker.sock`. It runs repository code from
|
||||||
|
pull requests, so keep its registration and permissions separate from the
|
||||||
|
trusted `homelab` runner. This separates users and host permissions, but both
|
||||||
|
runners still share the VPS kernel and network. Use a disposable VM if PRs from
|
||||||
|
untrusted external authors must be fully isolated.
|
||||||
|
|
||||||
|
## Workstation setup
|
||||||
|
|
||||||
|
As the existing SSH deploy user on workstation:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo loginctl enable-linger forust
|
||||||
|
bash .gitea/runner/setup-workstation.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
The controller uses `/srv/homelab` as the persistent configuration tree and makes
|
||||||
|
a detached source worktree for each SHA. It never resets `/srv/homelab`, moves
|
||||||
|
local configuration, renames Compose projects, or changes volume names.
|
||||||
|
The installer records the current Kubernetes context and cluster UID in
|
||||||
|
`~/.config/homelab-deploy/environment`. Check these before installing.
|
||||||
|
|
||||||
|
Configure Gitea Actions Variables:
|
||||||
|
|
||||||
|
- `DEPLOY_HOST`, `DEPLOY_USER`, `DEPLOY_PORT`: the existing VPS-to-workstation SSH endpoint.
|
||||||
|
- `DEPLOY_KNOWN_HOSTS`: workstation's verified SSH host key entry for that endpoint.
|
||||||
|
- `AUTODEPLOY`: `false` initially; `true` enables deployment after successful main CI.
|
||||||
|
|
||||||
|
Keep `DEPLOY_SSH_KEY`, `REGISTRY_USERNAME` and `REGISTRY_PASSWORD` in Actions
|
||||||
|
Secrets. Legacy endpoint secrets remain accepted during migration. The Actions
|
||||||
|
token must have repository read and Actions read access for release downloads.
|
||||||
|
The deploy user's existing Docker registry authentication remains necessary.
|
||||||
|
|
||||||
|
## Releases and deployment
|
||||||
|
|
||||||
|
CI publishes `release-<full SHA>` as a Gitea artifact with all three owned image
|
||||||
|
digests and build input fingerprints. Unchanged images are reused only from a
|
||||||
|
successful main CI artifact, never from `:prod`. Expired artifacts cause CI to
|
||||||
|
rebuild images; they block deployment until CI is rerun.
|
||||||
|
|
||||||
|
Run deploy from main with `deploy_ref=main` or a checked SHA:
|
||||||
|
|
||||||
|
- `full`: required for the first baseline; reconcile all active components.
|
||||||
|
- `changed`: compare with the last fully successful production deploy.
|
||||||
|
- `plan`: validate configuration and show selection without changing production resources.
|
||||||
|
- `refresh_images=true`: explicitly refresh mutable third-party Compose tags.
|
||||||
|
|
||||||
|
The manual and automatic paths both require successful CI, a successful build
|
||||||
|
job and the exact SHA's release artifact. PRs cannot publish images or deploy.
|
||||||
|
Removed resources are reported and require explicit removal; no automatic prune.
|
||||||
|
Service dependencies are listed in `.gitea/deploy-dependencies.json`.
|
||||||
|
|
||||||
|
A workstation user systemd service holds the deploy lock across validation,
|
||||||
|
sequential apply, verification and smoke checks. SSH clients only submit/follow:
|
||||||
|
disconnecting or cancelling the Actions client does not kill production apply.
|
||||||
|
Retrying the same run ID does not start another apply. `ExecStopPost` recovers
|
||||||
|
interrupted runs before the unit finishes. Kubernetes rolls back to captured
|
||||||
|
revisions; configuration and persistent data are not reverted.
|
||||||
|
|
||||||
|
## Status and recovery
|
||||||
|
|
||||||
|
`--retry` repeats failed verification and smoke checks, never apply. Recovery
|
||||||
|
keeps a failed deploy out of the successful baseline, even after rollback.
|
||||||
|
|
||||||
|
On workstation (replace the numeric ID with Actions run ID and attempt):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
python3 ~/.local/lib/homelab-deploy/controller.py status 123-1
|
||||||
|
python3 ~/.local/lib/homelab-deploy/controller.py recover 123-1 --retry
|
||||||
|
journalctl --user -u homelab-deploy@123-1
|
||||||
|
```
|
||||||
|
|
||||||
|
Runs live in `~/.local/state/homelab-deploy/runs`. Compose stores resolved configs
|
||||||
|
with restricted permissions; these may contain credentials and must never be
|
||||||
|
uploaded as CI artifacts. Stage logs print the exact manual recovery command
|
||||||
|
using `compose-before/<stack>.json`, the original project directory and project
|
||||||
|
name. Compose does not automatically roll back, and Nextcloud AIO's child
|
||||||
|
containers remain managed by AIO. Preserve its own backups for data recovery.
|
||||||
|
|
||||||
|
The controller retains twenty successful/planned runs and preserves failures.
|
||||||
|
Update the workstation dispatcher only when no deploy is running.
|
||||||
|
|
||||||
|
## Validation and migration rollback
|
||||||
|
|
||||||
|
```sh
|
||||||
|
python3 -m unittest discover -s tests -v
|
||||||
|
bash .gitea/tests/deploy-validation.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
Test on a separate namespace before the initial production `full` run. Check a
|
||||||
|
failed rollout, interrupted SSH and repeated run ID, and verify that an isolated
|
||||||
|
service change does not upgrade unrelated Helm releases or Compose stacks.
|
||||||
|
|
||||||
|
To roll back the migration, disable autodeploy and finish or recover the remote
|
||||||
|
run first. Restore the runner config/unit from `.before-<timestamp>` backups,
|
||||||
|
reload systemd and restart the runner. Restore the prior workflows from Git.
|
||||||
|
Production data and persistent volumes stay where they were. Do not remove run
|
||||||
|
state or Compose recovery files until recovery is confirmed.
|
||||||
|
|
||||||
|
### Compose configuration recovery
|
||||||
|
|
||||||
|
Successful deploys save the complete resolved Compose configuration in
|
||||||
|
`~/.local/state/homelab-deploy/compose-configs/`. These files can contain secrets.
|
||||||
|
Keep them private and do not commit or upload them.
|
||||||
|
The next deploy uses this configuration for its recovery file, including old
|
||||||
|
commands, environment, mounts, ports, and removed services. The recovery command
|
||||||
|
uses `--remove-orphans` to remove services added by the failed deploy. It does
|
||||||
|
not restore volume data or reverse database migrations.
|
||||||
|
|
||||||
|
On the first run after this update, the controller can use the Compose file
|
||||||
|
from the previous successful run. If that file is absent, it reads the persistent
|
||||||
|
checkout and checks its service configuration hashes against existing containers.
|
||||||
|
A mismatch stops preflight. Restore the previous configuration before retrying.
|
||||||
|
Update the installed controller with `bash .gitea/runner/setup-workstation.sh`
|
||||||
|
from the reviewed checkout before using this change.
|
||||||
|
|
||||||
|
New namespaces are checked during preflight. Server validation of their resources
|
||||||
|
runs after namespace creation and before application resources are applied.
|
||||||
|
Plan mode does not create namespaces. A failed deferred check can leave an empty
|
||||||
|
namespace; inspect it before removing it.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
[worker.oci]
|
||||||
|
gc = true
|
||||||
|
reservedSpace = "256MB"
|
||||||
|
maxUsedSpace = "1GB"
|
||||||
|
minFreeSpace = "2GB"
|
||||||
|
|
||||||
|
[[worker.oci.gcpolicy]]
|
||||||
|
reservedSpace = "256MB"
|
||||||
|
maxUsedSpace = "1GB"
|
||||||
|
minFreeSpace = "2GB"
|
||||||
|
all = true
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
runner:
|
||||||
|
file: /var/lib/gitea-runner/.runner
|
||||||
|
capacity: 1
|
||||||
|
timeout: 5h
|
||||||
|
labels:
|
||||||
|
- homelab:host
|
||||||
|
cache:
|
||||||
|
enabled: false
|
||||||
|
container:
|
||||||
|
docker_host: unix:///var/run/docker.sock
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Gitea Actions runner
|
||||||
|
After=network-online.target docker.service
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
User=gitea-runner
|
||||||
|
Group=gitea-runner
|
||||||
|
SupplementaryGroups=docker
|
||||||
|
WorkingDirectory=/var/lib/gitea-runner
|
||||||
|
Environment=PATH=/var/lib/gitea-runner/.cache/homelab-ci/bin:/usr/local/bin:/usr/bin:/bin
|
||||||
|
ExecStart=/usr/local/bin/gitea-runner daemon --config /etc/gitea-runner/config.yaml
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=5
|
||||||
|
UMask=0077
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Homelab deploy %i
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=exec
|
||||||
|
EnvironmentFile=%h/.config/homelab-deploy/environment
|
||||||
|
ExecStart=/usr/bin/python3 %h/.local/lib/homelab-deploy/controller.py execute %i
|
||||||
|
ExecStopPost=/usr/bin/python3 %h/.local/lib/homelab-deploy/controller.py recover %i
|
||||||
|
RuntimeMaxSec=5h
|
||||||
|
TimeoutStopSec=135min
|
||||||
|
KillMode=control-group
|
||||||
|
UMask=0077
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
runner:
|
||||||
|
file: /var/lib/gitea-pr-runner/.runner
|
||||||
|
capacity: 1
|
||||||
|
timeout: 5h
|
||||||
|
labels:
|
||||||
|
- homelab-pr:host
|
||||||
|
cache:
|
||||||
|
enabled: false
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Gitea Actions untrusted pull request runner
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
User=gitea-pr-runner
|
||||||
|
Group=gitea-pr-runner
|
||||||
|
WorkingDirectory=/var/lib/gitea-pr-runner
|
||||||
|
Environment=HOME=/var/lib/gitea-pr-runner
|
||||||
|
Environment=PATH=/var/lib/gitea-pr-runner/.cache/homelab-ci/bin:/usr/local/bin:/usr/bin:/bin
|
||||||
|
ExecStart=/usr/local/bin/gitea-runner daemon --config /etc/gitea-pr-runner/config.yaml
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=5
|
||||||
|
NoNewPrivileges=yes
|
||||||
|
PrivateTmp=yes
|
||||||
|
ProtectSystem=full
|
||||||
|
ProtectHome=yes
|
||||||
|
ProtectKernelTunables=yes
|
||||||
|
ProtectKernelModules=yes
|
||||||
|
ProtectControlGroups=yes
|
||||||
|
RestrictSUIDSGID=yes
|
||||||
|
LockPersonality=yes
|
||||||
|
UMask=0077
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Executable
+56
@@ -0,0 +1,56 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Install a native runner for untrusted PR jobs without Docker access.
|
||||||
|
set -euo pipefail
|
||||||
|
here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
[ "$(id -u)" -eq 0 ] || { echo 'Run with sudo on the runner host' >&2; exit 1; }
|
||||||
|
for tool in cp cut date getent id install runuser systemctl useradd; do
|
||||||
|
command -v "$tool" >/dev/null || { echo "Install missing prerequisite: $tool" >&2; exit 1; }
|
||||||
|
done
|
||||||
|
command -v /usr/local/bin/gitea-runner >/dev/null || {
|
||||||
|
echo 'Install gitea-runner 3.0.2 at /usr/local/bin/gitea-runner first' >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
id gitea-pr-runner >/dev/null 2>&1 || \
|
||||||
|
useradd --system --create-home --home-dir /var/lib/gitea-pr-runner --shell /usr/bin/bash gitea-pr-runner
|
||||||
|
runner_home="$(getent passwd gitea-pr-runner | cut -d: -f6)"
|
||||||
|
[ "$runner_home" = /var/lib/gitea-pr-runner ] || {
|
||||||
|
echo 'Unexpected PR runner home; inspect the existing service first' >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
case " $(id -nG gitea-pr-runner) " in
|
||||||
|
*' docker '*)
|
||||||
|
echo 'The PR runner account must not belong to the docker group' >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
install -d -m 0755 /etc/gitea-pr-runner
|
||||||
|
stamp="$(date -u +%Y%m%dT%H%M%SZ)"
|
||||||
|
for existing in /etc/gitea-pr-runner/config.yaml /etc/systemd/system/gitea-pr-runner.service; do
|
||||||
|
[ ! -f "$existing" ] || cp -p "$existing" "$existing.before-$stamp"
|
||||||
|
done
|
||||||
|
install -m 0644 "$here/pr-config.yaml" /etc/gitea-pr-runner/config.yaml
|
||||||
|
install -m 0644 "$here/pr-runner.service" /etc/systemd/system/gitea-pr-runner.service
|
||||||
|
|
||||||
|
if [ ! -f /var/lib/gitea-pr-runner/.runner ]; then
|
||||||
|
read -r -s -p 'Enter the Gitea repository runner registration token: ' runner_token
|
||||||
|
printf '\n'
|
||||||
|
[ -n "$runner_token" ] || { echo 'Runner token is required' >&2; exit 1; }
|
||||||
|
export GITEA_RUNNER_REGISTRATION_TOKEN="$runner_token"
|
||||||
|
unset runner_token
|
||||||
|
runuser --preserve-environment -u gitea-pr-runner -- \
|
||||||
|
/usr/local/bin/gitea-runner register \
|
||||||
|
--config /etc/gitea-pr-runner/config.yaml \
|
||||||
|
--instance https://gitea.forust.xyz \
|
||||||
|
--name homelab-pr \
|
||||||
|
--labels homelab-pr:host \
|
||||||
|
--no-interactive
|
||||||
|
unset GITEA_RUNNER_REGISTRATION_TOKEN
|
||||||
|
fi
|
||||||
|
chmod 0600 /var/lib/gitea-pr-runner/.runner
|
||||||
|
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable --now gitea-pr-runner.service
|
||||||
|
systemctl restart gitea-pr-runner.service
|
||||||
|
echo "PR runner ready. Configuration backups: *.before-$stamp"
|
||||||
Executable
+48
@@ -0,0 +1,48 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Native host runner, with pinned user-space tools and no extra CI images.
|
||||||
|
set -euo pipefail
|
||||||
|
here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
[ "$(id -u)" -eq 0 ] || { echo 'Run with sudo on the runner host' >&2; exit 1; }
|
||||||
|
for tool in docker curl python3 git tar xz flock runuser systemctl; do
|
||||||
|
command -v "$tool" >/dev/null || { echo "Install missing prerequisite: $tool" >&2; exit 1; }
|
||||||
|
done
|
||||||
|
docker info >/dev/null
|
||||||
|
docker compose version >/dev/null
|
||||||
|
docker buildx version >/dev/null
|
||||||
|
id gitea-runner >/dev/null 2>&1 || useradd --system --create-home --home-dir /var/lib/gitea-runner --shell /usr/bin/bash gitea-runner
|
||||||
|
# Reuse the established service account and runner registration.
|
||||||
|
runner_home="$(getent passwd gitea-runner | cut -d: -f6)"
|
||||||
|
[ "$runner_home" = /var/lib/gitea-runner ] || { echo 'Unexpected runner home; inspect the existing service first' >&2; exit 1; }
|
||||||
|
runuser -u gitea-runner -- docker info >/dev/null || { echo "The runner user needs access to Docker before setup" >&2; exit 1; }
|
||||||
|
command -v gitea-runner >/dev/null || { echo 'Install gitea-runner 3.0.2 at /usr/local/bin/gitea-runner first' >&2; exit 1; }
|
||||||
|
mkdir -p /etc/gitea-runner
|
||||||
|
stamp="$(date -u +%Y%m%dT%H%M%SZ)"
|
||||||
|
for existing in /etc/gitea-runner/config.yaml /etc/systemd/system/gitea-runner.service; do
|
||||||
|
[ ! -f "$existing" ] || cp -p "$existing" "$existing.before-$stamp"
|
||||||
|
done
|
||||||
|
scratch="$(mktemp -d)"
|
||||||
|
trap 'rm -rf "$scratch"' EXIT
|
||||||
|
chmod 755 "$scratch"
|
||||||
|
install -m 0644 "$here/../workflows/install-ci-tools.sh" "$here/../workflows/tool-versions.env" "$scratch/"
|
||||||
|
runuser -u gitea-runner -- bash "$scratch/install-ci-tools.sh"
|
||||||
|
install -m 0644 "$here/config.yaml" /etc/gitea-runner/config.yaml
|
||||||
|
python3 - <<'PYLABELS'
|
||||||
|
import json
|
||||||
|
from pathlib import Path
|
||||||
|
registration = Path('/var/lib/gitea-runner/.runner')
|
||||||
|
if registration.exists():
|
||||||
|
labels = json.loads(registration.read_text()).get('labels', [])
|
||||||
|
labels = [label for label in labels if isinstance(label, str) and label.split(':')[0] != 'homelab']
|
||||||
|
labels.append('homelab:host')
|
||||||
|
config = Path('/etc/gitea-runner/config.yaml')
|
||||||
|
config.write_text(config.read_text().replace(' - homelab:host', '\n'.join(' - ' + json.dumps(label) for label in labels)))
|
||||||
|
PYLABELS
|
||||||
|
install -m 0644 "$here/gitea-runner.service" /etc/systemd/system/gitea-runner.service
|
||||||
|
if [ ! -f /var/lib/gitea-runner/.runner ]; then
|
||||||
|
echo 'Register once as gitea-runner with homelab:host before starting the service.'
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable --now gitea-runner.service
|
||||||
|
systemctl restart gitea-runner.service
|
||||||
|
echo "Runner ready. Configuration backups: *.before-$stamp"
|
||||||
Executable
+32
@@ -0,0 +1,32 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Run as the existing deploy user on workstation. Never resets the working tree.
|
||||||
|
set -euo pipefail
|
||||||
|
here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
repo="${HOMELAB_REPO:-/srv/homelab}"
|
||||||
|
for tool in python3 git kubectl helm docker flock timeout; do
|
||||||
|
command -v "$tool" >/dev/null || { echo "Install missing dependency: $tool" >&2; exit 1; }
|
||||||
|
done
|
||||||
|
[ -d "$repo/.git" ] || { echo "Missing deploy checkout: $repo" >&2; exit 1; }
|
||||||
|
[[ "$repo" =~ ^/[A-Za-z0-9_./-]+$ ]] || { echo 'Deploy path must be absolute and contain no whitespace' >&2; exit 1; }
|
||||||
|
if [ "$(loginctl show-user "$USER" -p Linger --value)" != yes ]; then
|
||||||
|
echo "Run once: sudo loginctl enable-linger $USER" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
config="${XDG_CONFIG_HOME:-$HOME/.config}/homelab-deploy"
|
||||||
|
mkdir -p "$config" "$HOME/.local/lib/homelab-deploy" "$HOME/.config/systemd/user"
|
||||||
|
chmod 700 "$config"
|
||||||
|
if [ ! -f "$config/environment" ]; then
|
||||||
|
context="$(kubectl config current-context)"
|
||||||
|
cluster_uid="$(kubectl get namespace kube-system -o jsonpath='{.metadata.uid}')"
|
||||||
|
printf 'HOMELAB_REPO=%s\nKUBE_CONTEXT=%s\nEXPECTED_CLUSTER_UID=%s\n' "$repo" "$context" "$cluster_uid" >"$config/environment"
|
||||||
|
chmod 600 "$config/environment"
|
||||||
|
fi
|
||||||
|
# Do not replace a dispatcher while an existing deploy uses it.
|
||||||
|
if systemctl --user list-units 'homelab-deploy@*' --state=running --no-legend | grep -q .; then
|
||||||
|
echo 'An existing deploy is running; wait before updating the controller' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
install -m 0755 "$here/../workflows/deploy-controller.py" "$HOME/.local/lib/homelab-deploy/controller.py"
|
||||||
|
install -m 0644 "$here/homelab-deploy@.service" "$HOME/.config/systemd/user/homelab-deploy@.service"
|
||||||
|
systemctl --user daemon-reload
|
||||||
|
echo 'Controller ready. Run a checked main SHA in full mode for the initial baseline.'
|
||||||
Executable
+135
@@ -0,0 +1,135 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Local regressions only: kubectl is mocked and Docker is used for config parsing.
|
||||||
|
set -euo pipefail
|
||||||
|
repo="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||||
|
scratch="$(mktemp -d)"
|
||||||
|
trap 'rm -rf "$scratch"' EXIT
|
||||||
|
|
||||||
|
mkdir -p "$scratch/repo/app" "$scratch/repo/postgres" "$scratch/repo/netbird" "$scratch/repo/renovate"
|
||||||
|
git -C "$scratch/repo" init -q
|
||||||
|
for file in app/compose.yaml postgres/shared-compose.yaml netbird/client.compose.yaml renovate/renovate-compose.yaml; do
|
||||||
|
touch "$scratch/repo/$file"
|
||||||
|
done
|
||||||
|
git -C "$scratch/repo" add .
|
||||||
|
# shellcheck source=../workflows/compose-lint.sh
|
||||||
|
source "$repo/.gitea/workflows/compose-lint.sh"
|
||||||
|
actual="$(cd "$scratch/repo" && compose_files)"
|
||||||
|
expected=$'app/compose.yaml\nnetbird/client.compose.yaml\npostgres/shared-compose.yaml\nrenovate/renovate-compose.yaml'
|
||||||
|
[ "$actual" = "$expected" ] || { echo 'Compose discovery missed a file' >&2; exit 1; }
|
||||||
|
|
||||||
|
cat >"$scratch/compose.yaml" <<'YAML'
|
||||||
|
services:
|
||||||
|
example:
|
||||||
|
image: busybox:1.37.0
|
||||||
|
environment:
|
||||||
|
REQUIRED: ${HOMELAB_TEST_REQUIRED:?required for this regression}
|
||||||
|
YAML
|
||||||
|
unset HOMELAB_TEST_REQUIRED
|
||||||
|
if validate_compose_file "$scratch/compose.yaml" >"$scratch/config.log" 2>&1; then
|
||||||
|
echo 'Full Compose validation accepted a missing variable' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
grep -q 'required for this regression' "$scratch/config.log"
|
||||||
|
HOMELAB_TEST_REQUIRED=present validate_compose_file "$scratch/compose.yaml"
|
||||||
|
|
||||||
|
cat >"$scratch/resources.json" <<'JSON'
|
||||||
|
{"kind":"List","items":[
|
||||||
|
{"kind":"Deployment","metadata":{"namespace":"app"},"spec":{"template":{"spec":{
|
||||||
|
"containers":[{"envFrom":[{"secretRef":{"name":"credentials"}},{"secretRef":{"name":"optional","optional":true}}],"env":[{"valueFrom":{"secretKeyRef":{"name":"credentials","key":"password"}}}]}],
|
||||||
|
"initContainers":[{"envFrom":[{"secretRef":{"name":"init"}}]}],
|
||||||
|
"imagePullSecrets":[{"name":"registry"}],
|
||||||
|
"volumes":[{"secret":{"secretName":"mounted"}},{"projected":{"sources":[{"secret":{"name":"projected"}},{"secret":{"name":"optional-projected","optional":true}}]}}]
|
||||||
|
}}}},
|
||||||
|
{"kind":"CronJob","metadata":{},"spec":{"jobTemplate":{"spec":{"template":{"spec":{"containers":[{"envFrom":[{"secretRef":{"name":"cron"}}]}]}}}}}},
|
||||||
|
{"kind":"IngressRoute","metadata":{"namespace":"app"},"spec":{"tls":{"secretName":"controller-issued-tls"}}}
|
||||||
|
]}
|
||||||
|
JSON
|
||||||
|
actual="$(jq -r -f "$repo/.gitea/workflows/secret-references.jq" "$scratch/resources.json" | sort)"
|
||||||
|
expected=$'app credentials\napp init\napp mounted\napp projected\napp registry\ndefault cron'
|
||||||
|
[ "$actual" = "$expected" ] || { echo "Unexpected Secret references: $actual" >&2; exit 1; }
|
||||||
|
|
||||||
|
REPO="$repo"
|
||||||
|
# shellcheck source=../workflows/deploy-lib.sh
|
||||||
|
source "$repo/.gitea/workflows/deploy-lib.sh"
|
||||||
|
K8S_MANIFESTS=("$scratch/resources.json")
|
||||||
|
KUSTOMIZE_APPS=()
|
||||||
|
# No live cluster access. Reject credentials in app even if they exist elsewhere.
|
||||||
|
kubectl() {
|
||||||
|
case "$1" in
|
||||||
|
create) cat "$scratch/resources.json" ;;
|
||||||
|
get)
|
||||||
|
if [ "$3" = credentials ] && [ "$5" = app ]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
*) echo "Unexpected kubectl invocation: $*" >&2; return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
if check_referenced_secrets >"$scratch/secrets.log"; then
|
||||||
|
echo 'Namespace-scoped Secret check accepted a missing Secret' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
grep -q 'MISSING OR UNREADABLE: app/credentials' "$scratch/secrets.log"
|
||||||
|
# API/rendering errors must not produce an empty reference list and pass.
|
||||||
|
kubectl() { return 1; }
|
||||||
|
if ! skip_uninstalled_vmagent_crd "$REPO/prometheus-stack/k8s/vmagent.yaml"; then
|
||||||
|
echo 'VMAgent preflight did not skip an uninstalled CRD' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
kubectl() { return 0; }
|
||||||
|
if skip_uninstalled_vmagent_crd "$REPO/prometheus-stack/k8s/vmagent.yaml"; then
|
||||||
|
echo 'VMAgent preflight skipped an installed CRD' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if skip_uninstalled_vmagent_crd "$REPO/prometheus-stack/k8s/victoria.yaml"; then
|
||||||
|
echo 'VMAgent preflight skipped an unrelated manifest' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
kubectl() { return 1; }
|
||||||
|
if check_referenced_secrets >"$scratch/secrets.log"; then
|
||||||
|
echo 'Secret check accepted a failed manifest render' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
printf '%s\n' 'Deploy validation regressions passed.'
|
||||||
|
|
||||||
|
# New declared namespaces defer only their own resources during preflight.
|
||||||
|
render_selected_resources() {
|
||||||
|
cat <<'JSON'
|
||||||
|
{"apiVersion":"v1","kind":"List","items":[
|
||||||
|
{"apiVersion":"v1","kind":"Namespace","metadata":{"name":"new"}},
|
||||||
|
{"apiVersion":"v1","kind":"ConfigMap","metadata":{"name":"new-config","namespace":"new"}},
|
||||||
|
{"apiVersion":"v1","kind":"ConfigMap","metadata":{"name":"existing-config","namespace":"default"}}
|
||||||
|
]}
|
||||||
|
JSON
|
||||||
|
}
|
||||||
|
kubectl() {
|
||||||
|
case "$1" in
|
||||||
|
get) printf '%s\n' '{"items":[{"metadata":{"name":"default"}}]}' ;;
|
||||||
|
apply) cat >"$scratch/server-input.json" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
validate_server_resources true
|
||||||
|
jq -e '.items | length == 2 and all(.metadata.name != "new-config")' "$scratch/server-input.json" >/dev/null
|
||||||
|
if validate_server_resources false 2>"$scratch/deferred.log"; then
|
||||||
|
echo 'Post-namespace validation accepted a missing namespace' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
kubectl() {
|
||||||
|
case "$1" in
|
||||||
|
get) printf '%s\n' '{"items":[{"metadata":{"name":"default"}},{"metadata":{"name":"new"}}]}' ;;
|
||||||
|
apply) cat >"$scratch/server-input.json" ;;
|
||||||
|
*) return 1 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
validate_server_resources false
|
||||||
|
jq -e '.items | length == 3' "$scratch/server-input.json" >/dev/null
|
||||||
|
render_selected_resources() {
|
||||||
|
printf '%s\n' '{"items":[{"kind":"ConfigMap","metadata":{"name":"bad","namespace":"undeclared"}}]}'
|
||||||
|
}
|
||||||
|
if validate_server_resources true 2>"$scratch/undeclared.log"; then
|
||||||
|
echo 'Preflight accepted an undeclared missing namespace' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
printf '%s\n' 'Namespace validation regressions passed.'
|
||||||
+430
-279
@@ -1,29 +1,169 @@
|
|||||||
name: ci
|
name: ci
|
||||||
|
"on":
|
||||||
on:
|
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- "**"
|
- main
|
||||||
pull_request:
|
pull_request: null
|
||||||
workflow_dispatch:
|
workflow_dispatch: null
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: read
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ci-${{ github.ref }}
|
group: ci-${{ github.ref }}
|
||||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||||
|
|
||||||
env:
|
|
||||||
REGISTRY: gcr.forust.xyz
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint-prettier:
|
compose:
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
name: Compose
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Validate Compose files
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
source .gitea/workflows/compose-lint.sh
|
||||||
|
|
||||||
|
mapfile -t safe_flags < <(compose_safe_flags)
|
||||||
|
echo "docker compose config ${safe_flags[*]-}"
|
||||||
|
|
||||||
|
mapfile -t files < <(compose_files)
|
||||||
|
if [ "${#files[@]}" -eq 0 ]; then
|
||||||
|
echo "No Compose files found."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
failed=0
|
||||||
|
for f in "${files[@]}"; do
|
||||||
|
if ! out="$(validate_compose_file "$f" ${safe_flags[@]+"${safe_flags[@]}"} 2>&1)"; then
|
||||||
|
failed=1
|
||||||
|
echo "::error file=${f}::$(printf '%s' "$out" | head -1)"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$failed" -ne 0 ]; then
|
||||||
|
echo "Compose validation failed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "checked ${#files[@]} Compose file(s)"
|
||||||
|
id: check
|
||||||
|
- name: Write the job result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Compose
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.source.conclusion == 'failure'
|
||||||
|
&& 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
workflows:
|
||||||
|
name: Workflows
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh actionlint shellcheck)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
|
- name: Lint Gitea Actions workflows with actionlint
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
actionlint -config-file .gitea/actionlint.yaml -color .gitea/workflows/*.yaml
|
||||||
|
id: check
|
||||||
|
- name: Write the job result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Workflows
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
shell:
|
||||||
|
name: Shell
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh shellcheck jq)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
|
- name: Lint shell scripts with ShellCheck
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
mapfile -t scripts < <(
|
||||||
|
git ls-files '*.sh' ':(glob)**/*.bash'
|
||||||
|
)
|
||||||
|
if [ "${#scripts[@]}" -eq 0 ]; then
|
||||||
|
echo "No shell scripts found."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
shellcheck --external-sources --source-path=SCRIPTDIR --severity=style "${scripts[@]}"
|
||||||
|
bash .gitea/tests/deploy-validation.sh
|
||||||
|
id: check
|
||||||
|
- name: Write the job result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Shell
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
formatting:
|
||||||
|
name: Formatting
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh prettier)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
- name: Check formatting with Prettier
|
- name: Check formatting with Prettier
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
mapfile -t prettier_files < <(
|
mapfile -t prettier_files < <(
|
||||||
git ls-files \
|
git ls-files \
|
||||||
| grep -E '\.(md|json|ya?ml|html|css)$' \
|
| grep -E '\.(md|json|ya?ml|html|css)$' \
|
||||||
@@ -36,27 +176,80 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
prettier --check --ignore-unknown "${prettier_files[@]}"
|
prettier --check --ignore-unknown "${prettier_files[@]}"
|
||||||
|
id: check
|
||||||
lint-ruff:
|
- name: Write the job result
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
if: always()
|
||||||
steps:
|
env:
|
||||||
- name: Checkout repository
|
SUMMARY_CHECK: Formatting
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
- name: Lint Python with Ruff
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
ruff check .
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
lint-yaml:
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
python:
|
||||||
|
name: Python and tests
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh ruff jq)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
|
- name: Lint and format-check Python with Ruff
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
ruff check . .gitea/workflows
|
||||||
|
ruff format --check . .gitea/workflows
|
||||||
|
python3 -m unittest discover -s tests -v
|
||||||
|
id: check
|
||||||
|
- name: Write the job result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Python and tests
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
yaml:
|
||||||
|
name: YAML
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh yamllint)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
- name: Lint YAML syntax
|
- name: Lint YAML syntax
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
mapfile -t yaml_files < <(
|
mapfile -t yaml_files < <(
|
||||||
git ls-files '*.yaml' '*.yml' \
|
git ls-files '*.yaml' '*.yml' \
|
||||||
':!node_modules/**' \
|
':!node_modules/**' \
|
||||||
@@ -69,16 +262,42 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
yamllint -c .yamllint "${yaml_files[@]}"
|
yamllint -c .yamllint "${yaml_files[@]}"
|
||||||
|
id: check
|
||||||
lint-dockerfiles:
|
- name: Write the job result
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: YAML
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
dockerfiles:
|
||||||
|
name: Dockerfiles
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh hadolint)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
- name: Lint Dockerfiles
|
- name: Lint Dockerfiles
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
mapfile -t dockerfiles < <(
|
mapfile -t dockerfiles < <(
|
||||||
git ls-files ':(glob)**/Dockerfile' ':(glob)**/Dockerfile.*'
|
git ls-files ':(glob)**/Dockerfile' ':(glob)**/Dockerfile.*'
|
||||||
)
|
)
|
||||||
@@ -89,16 +308,42 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
hadolint -c .hadolint.yaml "${dockerfiles[@]}"
|
hadolint -c .hadolint.yaml "${dockerfiles[@]}"
|
||||||
|
id: check
|
||||||
validate:
|
- name: Write the job result
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
if: always()
|
||||||
steps:
|
env:
|
||||||
- name: Checkout repository
|
SUMMARY_CHECK: Dockerfiles
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
- name: Validate Kubernetes manifests
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
kubernetes:
|
||||||
|
name: Kubernetes
|
||||||
|
runs-on: ${{ github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
id: source
|
||||||
|
- name: Prepare pinned tools
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh kubeconform)"
|
||||||
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
|
id: tools
|
||||||
|
- name: Validate Kubernetes manifests against JSON schemas
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
mapfile -t manifests < <(
|
mapfile -t manifests < <(
|
||||||
git ls-files ':(glob)**/k8s/**/*.yaml' ':(glob)**/k8s/**/*.yml' \
|
git ls-files ':(glob)**/k8s/**/*.yaml' ':(glob)**/k8s/**/*.yml' \
|
||||||
| grep -Ev '(^|/)(kustomization\.ya?ml|.*\.example\.ya?ml|.*values\.ya?ml|patch-.*\.ya?ml)$'
|
| grep -Ev '(^|/)(kustomization\.ya?ml|.*\.example\.ya?ml|.*values\.ya?ml|patch-.*\.ya?ml)$'
|
||||||
@@ -114,256 +359,162 @@ jobs:
|
|||||||
-ignore-missing-schemas \
|
-ignore-missing-schemas \
|
||||||
-summary \
|
-summary \
|
||||||
"${manifests[@]}"
|
"${manifests[@]}"
|
||||||
|
id: check
|
||||||
build:
|
- name: Write the job result
|
||||||
needs: [lint-prettier, lint-ruff, lint-yaml, lint-dockerfiles, validate]
|
if: always()
|
||||||
if: github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'dev')
|
env:
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
SUMMARY_CHECK: Kubernetes
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP:
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Check or image build' || steps.tools.conclusion == 'failure'
|
||||||
|
&& 'Tool setup' || steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
image-plan:
|
||||||
|
needs: [compose, workflows, shell, formatting, python, yaml, dockerfiles, kubernetes]
|
||||||
|
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
|
||||||
|
runs-on: homelab
|
||||||
|
timeout-minutes: 10
|
||||||
outputs:
|
outputs:
|
||||||
services: ${{ steps.services.outputs.services }}
|
matrix: ${{ steps.plan.outputs.matrix }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
id: source
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
- name: Detect build inputs against successful CI
|
||||||
|
id: plan
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ github.token }}
|
||||||
|
run: python3 .gitea/workflows/release.py prepare --output build-plan.json
|
||||||
|
- name: Store the image plan
|
||||||
|
id: artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||||
|
with:
|
||||||
|
name: build-plan
|
||||||
|
path: build-plan.json
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 30
|
||||||
|
|
||||||
- name: Detect changed docker-built services
|
- name: Write the plan result
|
||||||
id: services
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Image plan
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP: >-
|
||||||
|
${{ steps.plan.conclusion == 'failure' && 'Build input detection' ||
|
||||||
|
steps.artifact.conclusion == 'failure' && 'Plan upload' ||
|
||||||
|
steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
base="${{ github.event.before }}"
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
if [ -z "$base" ] || [ "$base" = "0000000000000000000000000000000000000000" ]; then
|
python3 .gitea/workflows/release.py check-summary
|
||||||
base="$(git rev-list --max-parents=0 HEAD)"
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## Image plan\n\nResult: %s\n' "$SUMMARY_RESULT" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mapfile -t changed_files < <(git diff --name-only "$base" "${GITHUB_SHA}")
|
images:
|
||||||
|
name: Image (${{ matrix.name }})
|
||||||
services=()
|
needs: [image-plan]
|
||||||
|
if: needs.image-plan.result == 'success'
|
||||||
add_service() {
|
runs-on: homelab
|
||||||
local name="$1"
|
timeout-minutes: 60
|
||||||
local seen=0
|
strategy:
|
||||||
for existing in "${services[@]}"; do
|
max-parallel: 1
|
||||||
if [ "$existing" = "$name" ]; then
|
fail-fast: false
|
||||||
seen=1
|
matrix: ${{ fromJSON(needs.image-plan.outputs.matrix || '{"include":[{"name":"inactive"}]}') }}
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ "$seen" -eq 0 ]; then
|
|
||||||
services+=("$name")
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
for file in "${changed_files[@]}"; do
|
|
||||||
case "$file" in
|
|
||||||
dtek_notif/*)
|
|
||||||
add_service dtek_notif
|
|
||||||
;;
|
|
||||||
errorpages/*)
|
|
||||||
add_service errorpages
|
|
||||||
;;
|
|
||||||
userbot/*)
|
|
||||||
add_service userbot
|
|
||||||
;;
|
|
||||||
homepages/*)
|
|
||||||
add_service homepages
|
|
||||||
;;
|
|
||||||
edu_master/phpsessid-bot/*|edu_master/webinar-checker/*|edu_master/compose.yaml)
|
|
||||||
add_service edu_master
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "${#services[@]}" -eq 0 ]; then
|
|
||||||
echo "No docker-built services changed."
|
|
||||||
echo "services=" >> "$GITHUB_OUTPUT"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
printf '%s\n' "${services[@]}" | tee /tmp/services.txt
|
|
||||||
echo "services=$(paste -sd, /tmp/services.txt)" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- name: Log in to registry
|
|
||||||
if: steps.services.outputs.services != ''
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${REGISTRY}" \
|
|
||||||
-u "${{ secrets.REGISTRY_USERNAME }}" \
|
|
||||||
--password-stdin
|
|
||||||
|
|
||||||
- name: Build and push changed images
|
|
||||||
if: steps.services.outputs.services != ''
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
IFS=, read -r -a services <<< "${{ steps.services.outputs.services }}"
|
|
||||||
|
|
||||||
for service in "${services[@]}"; do
|
|
||||||
case "$service" in
|
|
||||||
dtek_notif)
|
|
||||||
image="${REGISTRY}/forust/dtek-notif"
|
|
||||||
tags=("latest")
|
|
||||||
case "${GITHUB_REF_NAME}" in
|
|
||||||
main)
|
|
||||||
tags+=("main" "prod")
|
|
||||||
;;
|
|
||||||
dev)
|
|
||||||
tags+=("dev")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
build_args=()
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
build_args+=(-t "${image}:${tag}")
|
|
||||||
done
|
|
||||||
docker build \
|
|
||||||
--cache-from "type=registry,ref=${image}:buildcache" \
|
|
||||||
--cache-to "type=registry,ref=${image}:buildcache,mode=max" \
|
|
||||||
"${build_args[@]}" dtek_notif
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
docker push "${image}:${tag}"
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
errorpages)
|
|
||||||
image="${REGISTRY}/forust/error-pages"
|
|
||||||
tags=("latest")
|
|
||||||
case "${GITHUB_REF_NAME}" in
|
|
||||||
main)
|
|
||||||
tags+=("main" "prod")
|
|
||||||
;;
|
|
||||||
dev)
|
|
||||||
tags+=("dev")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
build_args=()
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
build_args+=(-t "${image}:${tag}")
|
|
||||||
done
|
|
||||||
docker build \
|
|
||||||
--cache-from "type=registry,ref=${image}:buildcache" \
|
|
||||||
--cache-to "type=registry,ref=${image}:buildcache,mode=max" \
|
|
||||||
"${build_args[@]}" errorpages
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
docker push "${image}:${tag}"
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
userbot)
|
|
||||||
tags=("latest")
|
|
||||||
case "${GITHUB_REF_NAME}" in
|
|
||||||
main)
|
|
||||||
tags+=("main" "prod")
|
|
||||||
;;
|
|
||||||
dev)
|
|
||||||
tags+=("dev")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
for target in runtime panel; do
|
|
||||||
case "$target" in
|
|
||||||
runtime)
|
|
||||||
context="userbot"
|
|
||||||
image="${REGISTRY}/forust/userbot"
|
|
||||||
;;
|
|
||||||
panel)
|
|
||||||
context="userbot/panel"
|
|
||||||
image="${REGISTRY}/forust/userbot-panel"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
build_args=()
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
build_args+=(-t "${image}:${tag}")
|
|
||||||
done
|
|
||||||
docker build \
|
|
||||||
--cache-from "type=registry,ref=${image}:buildcache" \
|
|
||||||
--cache-to "type=registry,ref=${image}:buildcache,mode=max" \
|
|
||||||
"${build_args[@]}" "$context"
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
docker push "${image}:${tag}"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
homepages)
|
|
||||||
for service in forust xdfnx; do
|
|
||||||
case "$service" in
|
|
||||||
forust)
|
|
||||||
image="${REGISTRY}/forust/forust-homepage"
|
|
||||||
;;
|
|
||||||
xdfnx)
|
|
||||||
image="${REGISTRY}/forust/xdfnx-homepage"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
tags=("latest")
|
|
||||||
case "${GITHUB_REF_NAME}" in
|
|
||||||
main)
|
|
||||||
tags+=("main" "prod")
|
|
||||||
;;
|
|
||||||
dev)
|
|
||||||
tags+=("dev")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
build_args=()
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
build_args+=(-t "${image}:${tag}")
|
|
||||||
done
|
|
||||||
docker build \
|
|
||||||
--cache-from "type=registry,ref=${image}:buildcache" \
|
|
||||||
--cache-to "type=registry,ref=${image}:buildcache,mode=max" \
|
|
||||||
"${build_args[@]}" -f "homepages/Dockerfile.${service}" homepages
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
docker push "${image}:${tag}"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
edu_master)
|
|
||||||
for service in session-keeper webinar-checker; do
|
|
||||||
case "$service" in
|
|
||||||
session-keeper)
|
|
||||||
context="edu_master/phpsessid-bot"
|
|
||||||
image="${REGISTRY}/forust/session-keeper"
|
|
||||||
;;
|
|
||||||
webinar-checker)
|
|
||||||
context="edu_master/webinar-checker"
|
|
||||||
image="${REGISTRY}/forust/webinar-checker"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
tags=("latest")
|
|
||||||
case "${GITHUB_REF_NAME}" in
|
|
||||||
main)
|
|
||||||
tags+=("main" "prod")
|
|
||||||
;;
|
|
||||||
dev)
|
|
||||||
tags+=("dev")
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
build_args=()
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
build_args+=(-t "${image}:${tag}")
|
|
||||||
done
|
|
||||||
docker build \
|
|
||||||
--cache-from "type=registry,ref=${image}:buildcache" \
|
|
||||||
--cache-to "type=registry,ref=${image}:buildcache,mode=max" \
|
|
||||||
"${build_args[@]}" "$context"
|
|
||||||
for tag in "${tags[@]}"; do
|
|
||||||
docker push "${image}:${tag}"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
deploy-userbot-panel:
|
|
||||||
needs: build
|
|
||||||
if: github.ref_name == 'main' && contains(needs.build.outputs.services, 'userbot')
|
|
||||||
runs-on: [self-hosted, linux, arch, homelab, prod]
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
id: source
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
- name: Apply and roll out userbot panel
|
- name: Download the checked image plan
|
||||||
|
id: inputs
|
||||||
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
|
||||||
|
with:
|
||||||
|
name: build-plan
|
||||||
|
- name: Build or reuse this image
|
||||||
|
id: check
|
||||||
|
env:
|
||||||
|
IMAGE_NAME: ${{ matrix.name }}
|
||||||
|
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
|
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
run: python3 .gitea/workflows/release.py image --image "$IMAGE_NAME" --output image.json
|
||||||
|
- name: Store the image result
|
||||||
|
id: artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||||
|
with:
|
||||||
|
name: image-${{ matrix.name }}
|
||||||
|
path: image.json
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 30
|
||||||
|
- name: Write the job result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Image (${{ matrix.name }})
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP: >-
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Build or tag images' ||
|
||||||
|
steps.artifact.conclusion == 'failure' && 'Artifact upload' ||
|
||||||
|
steps.inputs.conclusion == 'failure' && 'Artifact download' ||
|
||||||
|
steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
kubectl apply -f userbot/k8s/base/panel.yaml
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
kubectl get secret userbot-common-secrets -n default -o json \
|
python3 .gitea/workflows/release.py check-summary
|
||||||
| jq 'del(.metadata.annotations,.metadata.creationTimestamp,.metadata.resourceVersion,.metadata.uid,.metadata.managedFields) | .metadata.namespace = "userbot"' \
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
| kubectl apply -f -
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
# Keep legacy deployments (forust/anna) in sync with manifests; they have no replicas field, so apply leaves scaling to the user manager only.
|
fi
|
||||||
kubectl apply -f userbot/k8s/base/userbots.yaml
|
|
||||||
kubectl rollout restart deployment/userbot-panel -n userbot
|
# Retain the build job name required by the immutable release deployment gate.
|
||||||
kubectl rollout status deployment/userbot-panel -n userbot --timeout=180s
|
build:
|
||||||
|
needs: [image-plan, images]
|
||||||
|
runs-on: homelab
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
id: source
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262
|
||||||
|
- name: Download all image results
|
||||||
|
id: inputs
|
||||||
|
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
|
||||||
|
with:
|
||||||
|
path: artifacts
|
||||||
|
- name: Pin SHA tags and write the complete release
|
||||||
|
id: check
|
||||||
|
env:
|
||||||
|
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
|
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
run: >-
|
||||||
|
python3 .gitea/workflows/release.py finalize
|
||||||
|
--plan artifacts/build-plan/build-plan.json
|
||||||
|
- name: Store commit release
|
||||||
|
id: artifact
|
||||||
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||||
|
with:
|
||||||
|
name: release-${{ github.sha }}
|
||||||
|
path: release.json
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 30
|
||||||
|
- name: Write the job result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
SUMMARY_CHECK: Image release and SHA tags
|
||||||
|
SUMMARY_RESULT: ${{ job.status }}
|
||||||
|
SUMMARY_FAILED_STEP: >-
|
||||||
|
${{ steps.check.conclusion == 'failure' && 'Build or tag images' ||
|
||||||
|
steps.artifact.conclusion == 'failure' && 'Artifact upload' ||
|
||||||
|
steps.inputs.conclusion == 'failure' && 'Artifact download' ||
|
||||||
|
steps.source.conclusion == 'failure' && 'Source checkout' || '' }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/release.py ]; then
|
||||||
|
python3 .gitea/workflows/release.py check-summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## %s\n\n- Result: **%s**\n- Failed step: %s\n' "$SUMMARY_CHECK" "$SUMMARY_RESULT" "$SUMMARY_FAILED_STEP" >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Shared helpers for validating Compose files. Sourced both by steps in
|
||||||
|
# .gitea/workflows/ci.yaml and by deploy-lib.sh on the workstation.
|
||||||
|
#
|
||||||
|
# Two levels of checking, matching how the repo is structured:
|
||||||
|
#
|
||||||
|
# general every committed Compose file, active or not. Pure structure check:
|
||||||
|
# no ${VAR} interpolation, no .env lookup, no bind-mount path
|
||||||
|
# resolution. Disabled stacks deliberately have no .env in the repo
|
||||||
|
# and no values on the CI runner, so a full `config` run would fail on
|
||||||
|
# their `${VAR:?}` guards for reasons that have nothing to do with the
|
||||||
|
# change under review.
|
||||||
|
#
|
||||||
|
# full active stacks only, with interpolation and env-file resolution, so
|
||||||
|
# required variables and referenced files are actually resolved. Needs
|
||||||
|
# the gitignored .env files, so this only runs in the deploy workflow
|
||||||
|
# on the workstation.
|
||||||
|
#
|
||||||
|
# This file is meant to be sourced, not executed.
|
||||||
|
|
||||||
|
# All committed Compose files, including the ones deploy never starts.
|
||||||
|
compose_files() {
|
||||||
|
git ls-files \
|
||||||
|
'*compose.yaml' '*compose.yml'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Prints the flags that turn `docker compose config` into the general check.
|
||||||
|
# Probed rather than hardcoded so an older Compose without --no-env-resolution
|
||||||
|
# still gets the flags it does support.
|
||||||
|
compose_safe_flags() {
|
||||||
|
local help flag
|
||||||
|
help="$(docker compose config --help 2>/dev/null || true)"
|
||||||
|
for flag in --no-interpolate --no-env-resolution --no-path-resolution; do
|
||||||
|
if printf '%s' "$help" | grep -q -- "$flag"; then
|
||||||
|
printf '%s\n' "$flag"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
# validate_compose_file <file> [extra docker compose config flags...]
|
||||||
|
validate_compose_file() {
|
||||||
|
local file="$1"
|
||||||
|
shift
|
||||||
|
docker compose -f "$file" config --quiet "$@"
|
||||||
|
}
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Resolve Compose images without changing project names or local bind paths."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def output(*args, **kwargs):
|
||||||
|
return subprocess.check_output(args, text=True, **kwargs).strip() # noqa: S603
|
||||||
|
|
||||||
|
|
||||||
|
def resolve(reference):
|
||||||
|
if '@sha256:' in reference:
|
||||||
|
return reference
|
||||||
|
descriptor = json.loads(
|
||||||
|
output('docker', 'buildx', 'imagetools', 'inspect', reference, '--format', '{{json .Manifest}}')
|
||||||
|
)
|
||||||
|
digest = descriptor['digest']
|
||||||
|
if not re.fullmatch(r'sha256:[0-9a-f]{64}', digest):
|
||||||
|
raise ValueError(f'Invalid registry digest for {reference}')
|
||||||
|
# Strip tag only from the final path segment (registry ports are preserved).
|
||||||
|
repository = reference.rsplit('/', 1)
|
||||||
|
repository[-1] = repository[-1].split(':')[0]
|
||||||
|
return '/'.join(repository) + '@' + digest
|
||||||
|
|
||||||
|
|
||||||
|
def prepare(source_file):
|
||||||
|
config_repo = Path(os.environ['CONFIG_REPO'])
|
||||||
|
source_repo = Path(os.environ['REPO'])
|
||||||
|
directory = Path(os.environ['RUN_DIR'])
|
||||||
|
relative = source_file.relative_to(source_repo)
|
||||||
|
project_dir = config_repo / relative.parent
|
||||||
|
base = ['docker', 'compose', '--project-directory', str(project_dir), '-f', str(source_file)]
|
||||||
|
config = json.loads(output(*base, 'config', '--format', 'json', cwd=config_repo))
|
||||||
|
project = config['name']
|
||||||
|
previous_file = directory / 'previous.json'
|
||||||
|
previous = json.loads(previous_file.read_text()) if previous_file.exists() else {}
|
||||||
|
images_file = directory / 'compose-images.json'
|
||||||
|
locks = json.loads(images_file.read_text()) if images_file.exists() else previous.get('compose-images', {})
|
||||||
|
release = json.loads((directory / 'release.json').read_text())
|
||||||
|
state = Path(os.environ.get('HOMELAB_STATE', Path.home() / '.local/state/homelab-deploy'))
|
||||||
|
baseline = state / 'compose-configs' / f'{relative.parent.name}.json'
|
||||||
|
if not baseline.exists() and re.fullmatch(r'[0-9]+-[0-9]+', previous.get('run_id', '')):
|
||||||
|
baseline = state / 'runs' / previous['run_id'] / 'compose' / baseline.name
|
||||||
|
bootstrap = not baseline.exists()
|
||||||
|
if not bootstrap:
|
||||||
|
before = json.loads(baseline.read_text())
|
||||||
|
else:
|
||||||
|
# Bootstrap from the persistent configuration, never from the new source.
|
||||||
|
persistent_file = config_repo / relative
|
||||||
|
if persistent_file.exists():
|
||||||
|
before = json.loads(
|
||||||
|
output(
|
||||||
|
'docker',
|
||||||
|
'compose',
|
||||||
|
'--project-directory',
|
||||||
|
str(project_dir),
|
||||||
|
'-f',
|
||||||
|
str(persistent_file),
|
||||||
|
'config',
|
||||||
|
'--format',
|
||||||
|
'json',
|
||||||
|
cwd=config_repo,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
elif output('docker', 'ps', '-aq', '--filter', f'label=com.docker.compose.project={project}'):
|
||||||
|
raise ValueError(f'{project}: no previous Compose configuration; restore it before deploy')
|
||||||
|
else:
|
||||||
|
before = {'name': project, 'services': {}}
|
||||||
|
if before['name'] != project:
|
||||||
|
raise ValueError('Compose project name changed; manual migration is required')
|
||||||
|
for service, settings in config['services'].items():
|
||||||
|
reference = settings.get('image')
|
||||||
|
nextcloud_aio_master = project == 'nextcloud' and service == 'nextcloud-aio-mastercontainer'
|
||||||
|
if not reference or settings.get('build'):
|
||||||
|
raise ValueError(f'{project}/{service}: Compose deploy requires a published image')
|
||||||
|
image_repo = reference.split('@')[0].rsplit('/', 1)
|
||||||
|
image_repo[-1] = image_repo[-1].split(':')[0]
|
||||||
|
image_repo = '/'.join(image_repo)
|
||||||
|
# Nextcloud AIO validates the mastercontainer image reference and rejects
|
||||||
|
# a digest. Keep its configured tag so AIO can start and manage its stack.
|
||||||
|
if nextcloud_aio_master:
|
||||||
|
pinned = reference
|
||||||
|
elif image_repo in release['images']:
|
||||||
|
pinned = image_repo + '@' + release['images'][image_repo]
|
||||||
|
elif os.environ.get('REFRESH_IMAGES') != 'true' and reference in locks:
|
||||||
|
pinned = locks[reference]
|
||||||
|
else:
|
||||||
|
pinned = resolve(reference)
|
||||||
|
settings['image'] = pinned
|
||||||
|
locks[reference] = pinned
|
||||||
|
for service, settings in before['services'].items():
|
||||||
|
reference = settings['image']
|
||||||
|
image_repo = reference.split('@')[0].rsplit('/', 1)
|
||||||
|
image_repo[-1] = image_repo[-1].split(':')[0]
|
||||||
|
image_repo = '/'.join(image_repo)
|
||||||
|
nextcloud_aio_master = project == 'nextcloud' and service == 'nextcloud-aio-mastercontainer'
|
||||||
|
# Capture what is running, not the current value of its mutable tag.
|
||||||
|
ids = output(
|
||||||
|
'docker',
|
||||||
|
'ps',
|
||||||
|
'-aq',
|
||||||
|
'--filter',
|
||||||
|
f'label=com.docker.compose.project={project}',
|
||||||
|
'--filter',
|
||||||
|
f'label=com.docker.compose.service={service}',
|
||||||
|
).splitlines()
|
||||||
|
actual = set()
|
||||||
|
if bootstrap and ids:
|
||||||
|
expected_hash = output(
|
||||||
|
'docker',
|
||||||
|
'compose',
|
||||||
|
'--project-directory',
|
||||||
|
str(project_dir),
|
||||||
|
'-f',
|
||||||
|
str(persistent_file),
|
||||||
|
'config',
|
||||||
|
'--hash',
|
||||||
|
service,
|
||||||
|
cwd=config_repo,
|
||||||
|
).split()[-1]
|
||||||
|
for container in ids:
|
||||||
|
running_hash = output(
|
||||||
|
'docker',
|
||||||
|
'inspect',
|
||||||
|
container,
|
||||||
|
'--format',
|
||||||
|
'{{ index .Config.Labels "com.docker.compose.config-hash" }}',
|
||||||
|
)
|
||||||
|
if running_hash != expected_hash:
|
||||||
|
raise ValueError(
|
||||||
|
f'{project}/{service}: persistent config differs from running config; restore the previous config'
|
||||||
|
)
|
||||||
|
for container in ids:
|
||||||
|
image_id = output('docker', 'inspect', container, '--format', '{{.Image}}')
|
||||||
|
digests = json.loads(output('docker', 'image', 'inspect', image_id, '--format', '{{json .RepoDigests}}'))
|
||||||
|
actual.add(next((d for d in digests or [] if d.split('@')[0] == image_repo), image_id))
|
||||||
|
if len(actual) > 1:
|
||||||
|
raise ValueError(f'{project}/{service}: mixed running images, cannot capture one recovery config')
|
||||||
|
# AIO also rejects a digest in its recovery config. Preserve its tag in
|
||||||
|
# both deploy and recovery files.
|
||||||
|
if nextcloud_aio_master:
|
||||||
|
before['services'][service]['image'] = reference
|
||||||
|
else:
|
||||||
|
before['services'][service]['image'] = next(iter(actual)) if actual else reference
|
||||||
|
for name, data in (('compose', config), ('compose-before', before)):
|
||||||
|
folder = directory / name
|
||||||
|
folder.mkdir(mode=0o700, exist_ok=True)
|
||||||
|
destination = folder / f'{relative.parent.name}.json'
|
||||||
|
destination.write_text(json.dumps(data, indent=2) + '\n')
|
||||||
|
destination.chmod(0o600)
|
||||||
|
images_file.write_text(json.dumps(locks, indent=2) + '\n')
|
||||||
|
print(f'Compose {project}: images pinned; local paths preserved')
|
||||||
|
print(
|
||||||
|
f'Recovery: docker compose --project-directory {project_dir} -p {project} -f {directory}/compose-before/{relative.parent.name}.json up -d --pull never --remove-orphans'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
prepare(Path(sys.argv[1]))
|
||||||
@@ -0,0 +1,427 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Durable workstation deployment controller. Install with setup-workstation.sh."""
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import contextlib
|
||||||
|
import fcntl
|
||||||
|
import importlib.util
|
||||||
|
import json
|
||||||
|
import math
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
STATE = Path(os.environ.get('HOMELAB_STATE', Path.home() / '.local/state/homelab-deploy'))
|
||||||
|
CONFIG_REPO = Path(os.environ.get('HOMELAB_REPO', '/srv/homelab'))
|
||||||
|
RUN_ID = re.compile(r'[0-9]+-[0-9]+')
|
||||||
|
|
||||||
|
|
||||||
|
def command(*args, **kwargs):
|
||||||
|
return subprocess.check_output(args, text=True, **kwargs).strip() # noqa: S603, S607
|
||||||
|
|
||||||
|
|
||||||
|
def atomic_json(path, data):
|
||||||
|
temporary = path.with_suffix('.tmp')
|
||||||
|
temporary.write_text(json.dumps(data, indent=2) + '\n')
|
||||||
|
temporary.chmod(0o600)
|
||||||
|
temporary.replace(path)
|
||||||
|
|
||||||
|
|
||||||
|
@contextlib.contextmanager
|
||||||
|
def lock(name):
|
||||||
|
STATE.mkdir(mode=0o700, parents=True, exist_ok=True)
|
||||||
|
with (STATE / name).open('a') as stream:
|
||||||
|
fcntl.flock(stream, fcntl.LOCK_EX)
|
||||||
|
yield
|
||||||
|
|
||||||
|
|
||||||
|
def load_module(name, path):
|
||||||
|
spec = importlib.util.spec_from_file_location(name, path)
|
||||||
|
module = importlib.util.module_from_spec(spec)
|
||||||
|
spec.loader.exec_module(module)
|
||||||
|
return module
|
||||||
|
|
||||||
|
|
||||||
|
def run_directory(run_id):
|
||||||
|
if not RUN_ID.fullmatch(run_id):
|
||||||
|
raise ValueError('Run ID must be numeric workflow-id and attempt')
|
||||||
|
return STATE / 'runs' / run_id
|
||||||
|
|
||||||
|
|
||||||
|
def start(run_id):
|
||||||
|
payload = sys.stdin.buffer.read(256 * 1024 + 1)
|
||||||
|
if len(payload) > 256 * 1024:
|
||||||
|
raise ValueError('Deploy request exceeds 256 KiB')
|
||||||
|
request = json.loads(payload)
|
||||||
|
sha = request['release']['sha']
|
||||||
|
if not re.fullmatch(r'[0-9a-f]{40}', sha) or request['mode'] not in ('changed', 'full', 'plan'):
|
||||||
|
raise ValueError('Invalid deploy SHA or mode')
|
||||||
|
if not isinstance(request['refresh_images'], bool):
|
||||||
|
raise ValueError('refresh_images must be boolean')
|
||||||
|
directory = run_directory(run_id)
|
||||||
|
with lock('prepare.lock'):
|
||||||
|
if (directory / 'request.json').exists():
|
||||||
|
if json.loads((directory / 'request.json').read_text()) != request:
|
||||||
|
raise ValueError('Run ID already belongs to a different request')
|
||||||
|
else:
|
||||||
|
directory.mkdir(mode=0o700, parents=True, exist_ok=True)
|
||||||
|
command('git', '-C', str(CONFIG_REPO), 'fetch', '--quiet', 'origin', 'main')
|
||||||
|
command('git', '-C', str(CONFIG_REPO), 'merge-base', '--is-ancestor', sha, 'origin/main')
|
||||||
|
if not (directory / 'source').exists():
|
||||||
|
command('git', '-C', str(CONFIG_REPO), 'worktree', 'add', '--detach', str(directory / 'source'), sha)
|
||||||
|
if command('git', '-C', str(directory / 'source'), 'rev-parse', 'HEAD') != sha:
|
||||||
|
raise ValueError('Prepared source does not match deploy SHA')
|
||||||
|
release_module = load_module('release', directory / 'source/.gitea/workflows/release.py')
|
||||||
|
release_module.validate_release(request['release'], sha)
|
||||||
|
atomic_json(directory / 'release.json', request['release'])
|
||||||
|
atomic_json(directory / 'request.json', request)
|
||||||
|
if not (directory / 'status.json').exists():
|
||||||
|
atomic_json(directory / 'status.json', {'state': 'queued', 'stages': {}})
|
||||||
|
# Starting an existing active or finished ID is idempotent; never re-apply it.
|
||||||
|
if json.loads((directory / 'status.json').read_text())['state'] == 'queued':
|
||||||
|
command('systemctl', '--user', 'start', '--no-block', f'homelab-deploy@{run_id}.service')
|
||||||
|
print(f'Accepted deploy {run_id} ({sha})')
|
||||||
|
|
||||||
|
|
||||||
|
def environment(directory):
|
||||||
|
request = json.loads((directory / 'request.json').read_text())
|
||||||
|
return {
|
||||||
|
**os.environ,
|
||||||
|
'REPO': str(directory / 'source'),
|
||||||
|
'CONFIG_REPO': str(CONFIG_REPO),
|
||||||
|
'RUN_DIR': str(directory),
|
||||||
|
'DEPLOY_SHA': request['release']['sha'],
|
||||||
|
'RELEASE_FILE': str(directory / 'release.json'),
|
||||||
|
'DEPLOY_PLAN': str(directory / 'plan.json'),
|
||||||
|
'DEPLOY_SNAPSHOT_DIR': str(directory / 'snapshot'),
|
||||||
|
'REFRESH_IMAGES': str(request['refresh_images']).lower(),
|
||||||
|
'ROLLOUT_PARALLELISM': '4',
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def stage(directory, name, budget):
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
if name in status['stages'] and status['stages'][name].get('result') in ('success', 'failure'):
|
||||||
|
return status['stages'][name]['result'] == 'success'
|
||||||
|
started = time.time()
|
||||||
|
status['stages'][name] = {'result': 'running', 'started': started}
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
script = directory / 'source/.gitea/workflows/deploy-stage.sh'
|
||||||
|
with (directory / f'{name}.log').open('a') as log:
|
||||||
|
# timeout kills the whole stage process group, including children, before recovery.
|
||||||
|
result = subprocess.run( # noqa: S603, S607
|
||||||
|
[
|
||||||
|
shutil.which('timeout') or '/usr/bin/timeout',
|
||||||
|
'--signal=TERM',
|
||||||
|
'--kill-after=30s',
|
||||||
|
str(budget),
|
||||||
|
'bash',
|
||||||
|
str(script),
|
||||||
|
name,
|
||||||
|
],
|
||||||
|
env=environment(directory),
|
||||||
|
stdout=log,
|
||||||
|
stderr=subprocess.STDOUT,
|
||||||
|
check=False,
|
||||||
|
).returncode
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
status['stages'][name].update(
|
||||||
|
result='success' if result == 0 else 'failure', exit_code=result, seconds=round(time.time() - started)
|
||||||
|
)
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
return result == 0
|
||||||
|
|
||||||
|
|
||||||
|
def make_plan(directory):
|
||||||
|
source = directory / 'source'
|
||||||
|
planner = load_module('deploy_plan', source / '.gitea/workflows/deploy-plan.py')
|
||||||
|
request = json.loads((directory / 'request.json').read_text())
|
||||||
|
previous = json.loads((STATE / 'last-success.json').read_text()) if (STATE / 'last-success.json').exists() else None
|
||||||
|
# Helm 4 lists every release status by default and removed the --all flag.
|
||||||
|
helm = json.loads(command('helm', 'list', '-A', '-o', 'json'))
|
||||||
|
plan = planner.make_plan(source, CONFIG_REPO, request['release'], previous, request['mode'], helm)
|
||||||
|
if request['refresh_images']:
|
||||||
|
plan['selected']['compose'] = plan['active']['compose']
|
||||||
|
atomic_json(directory / 'plan.json', plan)
|
||||||
|
if previous:
|
||||||
|
atomic_json(directory / 'previous.json', previous)
|
||||||
|
# Local config is deliberately separate from the immutable Git source.
|
||||||
|
return plan
|
||||||
|
|
||||||
|
|
||||||
|
def finish_success(directory, plan):
|
||||||
|
# Repeating finalization after a crash is safe while holding deploy.lock.
|
||||||
|
plan['run_id'] = directory.name
|
||||||
|
path = directory / 'compose-images.json'
|
||||||
|
previous = directory / 'previous.json'
|
||||||
|
plan['compose-images'] = (
|
||||||
|
json.loads(path.read_text())
|
||||||
|
if path.exists()
|
||||||
|
else json.loads(previous.read_text()).get('compose-images', {})
|
||||||
|
if previous.exists()
|
||||||
|
else {}
|
||||||
|
)
|
||||||
|
configs = STATE / 'compose-configs'
|
||||||
|
configs.mkdir(mode=0o700, exist_ok=True)
|
||||||
|
for config in (directory / 'compose').glob('*.json'):
|
||||||
|
atomic_json(configs / config.name, json.loads(config.read_text()))
|
||||||
|
atomic_json(STATE / 'last-success.json', plan)
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
status['state'] = 'success'
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
try:
|
||||||
|
retain_completed(directory)
|
||||||
|
except (OSError, subprocess.CalledProcessError) as error:
|
||||||
|
print(f'Retention deferred: {error}', flush=True)
|
||||||
|
|
||||||
|
|
||||||
|
def recover(directory, retry=False):
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
if status['state'] in ('success', 'planned'):
|
||||||
|
return
|
||||||
|
completed = ('doctor', 'validate', 'apply-k8s', 'apply-compose', 'verify-k8s', 'smoke')
|
||||||
|
if all(status['stages'].get(name, {}).get('result') == 'success' for name in completed):
|
||||||
|
finish_success(directory, json.loads((directory / 'plan.json').read_text()))
|
||||||
|
return
|
||||||
|
if retry:
|
||||||
|
for name in ('verify-k8s', 'smoke'):
|
||||||
|
if status['stages'].get(name, {}).get('result') == 'failure':
|
||||||
|
del status['stages'][name]
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
snapshot = directory / 'snapshot/current'
|
||||||
|
if snapshot.exists():
|
||||||
|
stage(directory, 'verify-k8s', 7200)
|
||||||
|
stage(directory, 'smoke', 600)
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
status['state'] = 'failure'
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
|
||||||
|
|
||||||
|
def execute(run_id):
|
||||||
|
directory = run_directory(run_id)
|
||||||
|
with lock('deploy.lock'):
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
if status['state'] != 'queued':
|
||||||
|
return
|
||||||
|
# A crashed predecessor must be recovered before another apply begins.
|
||||||
|
for other in (STATE / 'runs').iterdir():
|
||||||
|
if (
|
||||||
|
other != directory
|
||||||
|
and (other / 'status.json').exists()
|
||||||
|
and json.loads((other / 'status.json').read_text())['state'] == 'running'
|
||||||
|
):
|
||||||
|
raise ValueError(f'Interrupted deploy {other.name}; run recover first')
|
||||||
|
status['state'] = 'running'
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
phase = 'plan'
|
||||||
|
try:
|
||||||
|
plan = make_plan(directory)
|
||||||
|
print(
|
||||||
|
json.dumps({'selected': plan['selected'], 'helm': plan['helm'], 'manual_removals': plan['removed']}),
|
||||||
|
flush=True,
|
||||||
|
)
|
||||||
|
phase = 'doctor'
|
||||||
|
if not stage(directory, 'doctor', 600):
|
||||||
|
raise RuntimeError('Preflight failed')
|
||||||
|
phase = 'validate'
|
||||||
|
if not stage(directory, 'validate', 1200):
|
||||||
|
raise RuntimeError('Validation failed')
|
||||||
|
if json.loads((directory / 'request.json').read_text())['mode'] == 'plan':
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
status['state'] = 'planned'
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
return
|
||||||
|
# Budget includes both rollout checks and rollback waves, plus API overhead.
|
||||||
|
phase = 'Recovery budget'
|
||||||
|
count = int(
|
||||||
|
command(
|
||||||
|
'bash',
|
||||||
|
str(directory / 'source/.gitea/workflows/deploy-stage.sh'),
|
||||||
|
'workload-count',
|
||||||
|
env=environment(directory),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
verify_budget = max(600, 2 * math.ceil(count / 4) * 300 + 120)
|
||||||
|
if verify_budget > 7200:
|
||||||
|
raise ValueError('More than two hours of recovery required; split this deploy')
|
||||||
|
phase = 'apply-k8s'
|
||||||
|
k8s_ok = stage(directory, 'apply-k8s', 2700)
|
||||||
|
phase = 'apply-compose'
|
||||||
|
compose_ok = stage(directory, 'apply-compose', 1800) if k8s_ok else False
|
||||||
|
phase = 'verify-k8s'
|
||||||
|
verify_ok = stage(directory, 'verify-k8s', verify_budget)
|
||||||
|
phase = 'smoke'
|
||||||
|
smoke_ok = stage(directory, 'smoke', 600)
|
||||||
|
if not all((k8s_ok, compose_ok, verify_ok, smoke_ok)):
|
||||||
|
raise RuntimeError('Deploy failed; inspect stage logs and recovery report')
|
||||||
|
phase = 'Save the successful baseline'
|
||||||
|
finish_success(directory, plan)
|
||||||
|
except Exception as error:
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
status['failure_stage'] = next(
|
||||||
|
(name for name, result in status['stages'].items() if result.get('result') == 'failure'), phase
|
||||||
|
)
|
||||||
|
atomic_json(directory / 'status.json', status)
|
||||||
|
with (directory / 'controller.log').open('a') as stream:
|
||||||
|
stream.write(f'{error}\n')
|
||||||
|
recover(directory)
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def retain_completed(current):
|
||||||
|
finished = []
|
||||||
|
for directory in (STATE / 'runs').iterdir():
|
||||||
|
status_file = directory / 'status.json'
|
||||||
|
if status_file.exists() and json.loads(status_file.read_text())['state'] in ('success', 'planned'):
|
||||||
|
finished.append(directory)
|
||||||
|
for directory in sorted(finished, key=lambda p: p.stat().st_mtime, reverse=True)[20:]:
|
||||||
|
if directory == current:
|
||||||
|
continue
|
||||||
|
command('git', '-C', str(CONFIG_REPO), 'worktree', 'remove', '--force', str(directory / 'source'))
|
||||||
|
shutil.rmtree(directory)
|
||||||
|
|
||||||
|
|
||||||
|
def follow(run_id, phase):
|
||||||
|
directory = run_directory(run_id)
|
||||||
|
groups = {
|
||||||
|
'apply': ('doctor', 'validate', 'apply-k8s', 'apply-compose'),
|
||||||
|
'verify': ('verify-k8s',),
|
||||||
|
'smoke': ('smoke',),
|
||||||
|
}
|
||||||
|
names = groups[phase]
|
||||||
|
offsets = {}
|
||||||
|
while True:
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
for name in (*names, 'controller'):
|
||||||
|
path = directory / f'{name}.log'
|
||||||
|
if path.exists():
|
||||||
|
with path.open() as stream:
|
||||||
|
stream.seek(offsets.get(name, 0))
|
||||||
|
content = stream.read()
|
||||||
|
if content:
|
||||||
|
print(content, end='', flush=True)
|
||||||
|
offsets[name] = stream.tell()
|
||||||
|
stages = status['stages']
|
||||||
|
if all(stages.get(name, {}).get('result') in ('success', 'failure') for name in names):
|
||||||
|
return all(stages[name]['result'] == 'success' for name in names)
|
||||||
|
if status['state'] in ('success', 'failure', 'planned'):
|
||||||
|
return status['state'] in ('success', 'planned')
|
||||||
|
time.sleep(3)
|
||||||
|
|
||||||
|
|
||||||
|
def summary(run_id):
|
||||||
|
directory = run_directory(run_id)
|
||||||
|
request = json.loads((directory / 'request.json').read_text())
|
||||||
|
release = request['release']
|
||||||
|
plan_file = directory / 'plan.json'
|
||||||
|
lines = [
|
||||||
|
f'## Deploy `{release["sha"]}`',
|
||||||
|
'',
|
||||||
|
f'- Mode: `{request["mode"]}`',
|
||||||
|
f'- Refresh third-party images: `{request["refresh_images"]}`',
|
||||||
|
]
|
||||||
|
status = json.loads((directory / 'status.json').read_text())
|
||||||
|
if status.get('failure_stage'):
|
||||||
|
lines.append(f'- Failed stage: **{status["failure_stage"]}**')
|
||||||
|
lines.extend(
|
||||||
|
[
|
||||||
|
'',
|
||||||
|
f'- Observed run state: **{status["state"]}**',
|
||||||
|
'',
|
||||||
|
'### Stage results',
|
||||||
|
'| Stage | Result | Exit code |',
|
||||||
|
'| --- | --- | --- |',
|
||||||
|
]
|
||||||
|
)
|
||||||
|
for name in ('doctor', 'validate', 'apply-k8s', 'apply-compose', 'verify-k8s', 'smoke'):
|
||||||
|
stage_result = status['stages'].get(name, {})
|
||||||
|
lines.append(f'| {name} | {stage_result.get("result", "not started")} | {stage_result.get("exit_code", "—")} |')
|
||||||
|
lines.extend(['', '### Apply and Helm recovery results'])
|
||||||
|
events_file = directory / 'apply-events.jsonl'
|
||||||
|
events = []
|
||||||
|
if events_file.exists():
|
||||||
|
for line in events_file.read_text().splitlines():
|
||||||
|
try:
|
||||||
|
events.append(json.loads(line))
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
lines.append('- An operation record is incomplete. Check the stage log.')
|
||||||
|
latest = {(event['action'], event['target']): event['result'] for event in events}
|
||||||
|
lines.extend(f'- `{action}` `{target}`: **{result}**' for (action, target), result in latest.items())
|
||||||
|
if not latest:
|
||||||
|
lines.append('- No apply results were recorded.')
|
||||||
|
lines.append('- A completed apply does not confirm health. See verification and smoke results.')
|
||||||
|
lines.extend(['', '### Kubernetes recovery'])
|
||||||
|
pointer = directory / 'snapshot/current'
|
||||||
|
failed = Path(pointer.read_text().strip()) / 'failed-workloads' if pointer.exists() else None
|
||||||
|
if failed and failed.exists():
|
||||||
|
contents = failed.read_text()
|
||||||
|
counts = dict(re.findall(r'^(ROLLED_BACK|UNRECOVERED)=([0-9]+)$', contents, re.MULTILINE))
|
||||||
|
if not contents.strip():
|
||||||
|
lines.append('- No failed workloads were recorded. See the verification result above.')
|
||||||
|
elif counts:
|
||||||
|
lines.append(f'- Workloads restored: **{counts.get("ROLLED_BACK", "unknown")}**')
|
||||||
|
lines.append(f'- Workloads that need manual recovery: **{counts.get("UNRECOVERED", "unknown")}**')
|
||||||
|
else:
|
||||||
|
lines.append('- Rollback has no recorded result yet. Check the verification log.')
|
||||||
|
else:
|
||||||
|
lines.append('- No workload rollback was recorded. This does not confirm health.')
|
||||||
|
lines.append('- Compose requires manual recovery. Use the saved command in the apply log.')
|
||||||
|
if not plan_file.exists():
|
||||||
|
lines.extend(['', 'Plan was not created. Check the controller log.'])
|
||||||
|
print('\n'.join(lines))
|
||||||
|
return
|
||||||
|
plan = json.loads(plan_file.read_text())
|
||||||
|
lines.extend(['', '### Selected services'])
|
||||||
|
count = 0
|
||||||
|
for kind, services in plan['selected'].items():
|
||||||
|
for service in services:
|
||||||
|
lines.append(f'- `{kind}`: `{service}`')
|
||||||
|
count += 1
|
||||||
|
if not count:
|
||||||
|
lines.append('- None')
|
||||||
|
lines.extend(['', '### Selected Helm releases'])
|
||||||
|
lines.extend(f'- `{release}`' for release in plan.get('helm', []))
|
||||||
|
if not plan.get('helm'):
|
||||||
|
lines.append('- None')
|
||||||
|
lines.extend(['', '### Images pinned in the checked release'])
|
||||||
|
lines.extend(f'- `{image}@{digest}`' for image, digest in sorted(release['images'].items()))
|
||||||
|
lines.extend(['', '### Removed resources requiring manual review'])
|
||||||
|
lines.extend(f'- `{item}`' for item in plan.get('removed', []))
|
||||||
|
if not plan.get('removed'):
|
||||||
|
lines.append('- None')
|
||||||
|
print('\n'.join(lines))
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
os.umask(0o077)
|
||||||
|
parser = argparse.ArgumentParser(description=__doc__)
|
||||||
|
parser.add_argument('action', choices=('start', 'execute', 'recover', 'status', 'follow', 'summary'))
|
||||||
|
parser.add_argument('run_id')
|
||||||
|
parser.add_argument('phase', nargs='?', choices=('apply', 'verify', 'smoke'))
|
||||||
|
parser.add_argument('--retry', action='store_true', help='Retry failed recovery checks; never repeat apply')
|
||||||
|
args = parser.parse_args()
|
||||||
|
directory = run_directory(args.run_id)
|
||||||
|
if args.action == 'start':
|
||||||
|
start(args.run_id)
|
||||||
|
elif args.action == 'execute':
|
||||||
|
execute(args.run_id)
|
||||||
|
elif args.action == 'recover':
|
||||||
|
with lock('deploy.lock'):
|
||||||
|
recover(directory, retry=args.retry)
|
||||||
|
elif args.action == 'status':
|
||||||
|
print((directory / 'status.json').read_text())
|
||||||
|
if (directory / 'plan.json').exists():
|
||||||
|
plan = json.loads((directory / 'plan.json').read_text())
|
||||||
|
print(json.dumps({k: plan[k] for k in ('sha', 'selected', 'helm', 'removed')}, indent=2))
|
||||||
|
elif args.action == 'summary':
|
||||||
|
summary(args.run_id)
|
||||||
|
elif not follow(args.run_id, args.phase):
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,124 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Calculate selected components against the last fully successful deploy."""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def output(*args, **kwargs):
|
||||||
|
return subprocess.check_output(args, text=True, **kwargs).strip() # noqa: S603
|
||||||
|
|
||||||
|
|
||||||
|
def tracked(repo):
|
||||||
|
return output('git', '-C', str(repo), 'ls-files').splitlines()
|
||||||
|
|
||||||
|
|
||||||
|
def helm_releases(repo):
|
||||||
|
text = (repo / '.gitea/workflows/deploy-lib.sh').read_text()
|
||||||
|
return [line.split('|') for line in re.findall(r'^ "([^"\n]+\|[^"\n]+)"$', text, re.MULTILINE)]
|
||||||
|
|
||||||
|
|
||||||
|
def inventory(repo):
|
||||||
|
files = tracked(repo)
|
||||||
|
k8s = sorted(
|
||||||
|
{f.split('/k8s/')[0] for f in files if '/k8s/' in f and (repo / f.split('/k8s/')[0] / 'k8s/active').is_file()}
|
||||||
|
)
|
||||||
|
compose = sorted(
|
||||||
|
{
|
||||||
|
str(Path(f).parent)
|
||||||
|
for f in files
|
||||||
|
if Path(f).name in ('compose.yaml', 'compose.yml') and (repo / Path(f).parent / 'active').is_file()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return {'k8s': k8s, 'compose': compose}
|
||||||
|
|
||||||
|
|
||||||
|
def file_hash(path):
|
||||||
|
return hashlib.sha256(path.read_bytes()).hexdigest() if path.is_file() else 'missing'
|
||||||
|
|
||||||
|
|
||||||
|
def make_plan(repo, config_repo, release, previous, mode, live_helm):
|
||||||
|
active = inventory(repo)
|
||||||
|
all_services = set(active['k8s'] + active['compose'])
|
||||||
|
helm_inputs = {}
|
||||||
|
helm_selected = []
|
||||||
|
for name, chart, namespace, version, values, marker in helm_releases(repo):
|
||||||
|
if not (repo / marker).is_file():
|
||||||
|
continue
|
||||||
|
value_path = repo / values if (repo / values).is_file() else config_repo / values
|
||||||
|
if not value_path.is_file():
|
||||||
|
raise ValueError(f'Missing Helm values: {values}')
|
||||||
|
stamp = hashlib.sha256(f'{chart}|{version}|{file_hash(value_path)}'.encode()).hexdigest()
|
||||||
|
helm_inputs[name] = stamp
|
||||||
|
live = next((h for h in live_helm if h['name'] == name and h['namespace'] == namespace), None)
|
||||||
|
if (
|
||||||
|
mode == 'full'
|
||||||
|
or previous is None
|
||||||
|
or previous.get('helm_inputs', {}).get(name) != stamp
|
||||||
|
or live is None
|
||||||
|
or live.get('status') != 'deployed'
|
||||||
|
or live.get('chart') != f'{chart.split("/")[-1]}-{version}'
|
||||||
|
):
|
||||||
|
helm_selected.append(name)
|
||||||
|
local_inputs = {}
|
||||||
|
for service in all_services:
|
||||||
|
candidates = [config_repo / service / '.env']
|
||||||
|
if service in active['compose']:
|
||||||
|
candidates.append(config_repo / '.env')
|
||||||
|
cfg = config_repo / service / 'config'
|
||||||
|
if cfg.is_dir():
|
||||||
|
candidates.extend(
|
||||||
|
p for p in cfg.rglob('*') if p.is_file() and p.suffix in ('.yaml', '.yml', '.json', '.conf')
|
||||||
|
)
|
||||||
|
local_inputs[service] = hashlib.sha256(
|
||||||
|
'\n'.join(f'{p.relative_to(config_repo)}:{file_hash(p)}' for p in sorted(candidates)).encode()
|
||||||
|
).hexdigest()
|
||||||
|
if previous is None:
|
||||||
|
if mode == 'changed':
|
||||||
|
raise ValueError('No successful baseline; run deploy in full mode first')
|
||||||
|
changed = set(all_services)
|
||||||
|
removed = []
|
||||||
|
else:
|
||||||
|
paths = output('git', '-C', str(repo), 'diff', '--name-only', previous['sha'], release['sha']).splitlines()
|
||||||
|
changed = {service for service in all_services for path in paths if path.startswith(service + '/')}
|
||||||
|
if any(path.startswith('.gitea/') for path in paths):
|
||||||
|
changed |= all_services
|
||||||
|
changed |= {s for s in all_services if previous.get('local_inputs', {}).get(s) != local_inputs[s]}
|
||||||
|
for file in tracked(repo):
|
||||||
|
owners = {service for service in all_services if file.startswith(service + '/')}
|
||||||
|
if not owners or not file.endswith(('.yaml', '.yml')):
|
||||||
|
continue
|
||||||
|
text = (repo / file).read_text()
|
||||||
|
if any(
|
||||||
|
image in text and previous.get('images', {}).get(image) != digest
|
||||||
|
for image, digest in release['images'].items()
|
||||||
|
):
|
||||||
|
changed |= owners
|
||||||
|
removed = sorted(
|
||||||
|
set(previous.get('active', {}).get('k8s', []) + previous.get('active', {}).get('compose', []))
|
||||||
|
- all_services
|
||||||
|
)
|
||||||
|
removed += [path for path in paths if '/k8s/' in path and not (repo / path).exists()]
|
||||||
|
if mode == 'full':
|
||||||
|
changed = set(all_services)
|
||||||
|
dependencies = json.loads((repo / '.gitea/deploy-dependencies.json').read_text())
|
||||||
|
while True:
|
||||||
|
expanded = changed | {dependent for service in changed for dependent in dependencies.get(service, [])}
|
||||||
|
if expanded == changed:
|
||||||
|
break
|
||||||
|
changed = expanded
|
||||||
|
return {
|
||||||
|
'version': 1,
|
||||||
|
'sha': release['sha'],
|
||||||
|
'images': release['images'],
|
||||||
|
'active': active,
|
||||||
|
'selected': {kind: sorted(set(services) & changed) for kind, services in active.items()},
|
||||||
|
'helm': helm_selected,
|
||||||
|
'helm_inputs': helm_inputs,
|
||||||
|
'local_inputs': local_inputs,
|
||||||
|
'removed': sorted(set(removed)),
|
||||||
|
'full_smoke': mode == 'full' or 'traefik' in changed,
|
||||||
|
}
|
||||||
Executable
+10
@@ -0,0 +1,10 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
source "${REPO:?}/.gitea/workflows/deploy-lib.sh"
|
||||||
|
case "${1:?stage required}" in
|
||||||
|
workload-count)
|
||||||
|
select_manifests >/dev/null
|
||||||
|
selected_workload_refs | sort -u | wc -l
|
||||||
|
;;
|
||||||
|
*) run_stage "$1" ;;
|
||||||
|
esac
|
||||||
+122
-158
@@ -1,176 +1,140 @@
|
|||||||
name: deploy
|
name: deploy
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
workflow_run:
|
||||||
|
workflows: [ci]
|
||||||
|
branches: [main]
|
||||||
|
types: [completed]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
deploy_ref:
|
||||||
|
description: "Commit already checked by successful main CI (main or SHA)"
|
||||||
|
default: main
|
||||||
|
required: true
|
||||||
|
deploy_mode:
|
||||||
|
description: "First deploy requires full; plan changes no production resources"
|
||||||
|
type: choice
|
||||||
|
options: [changed, full, plan]
|
||||||
|
default: changed
|
||||||
|
refresh_images:
|
||||||
|
description: "Explicitly refresh mutable third-party Compose tags"
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: read
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: deploy-main
|
group: deploy-main
|
||||||
cancel-in-progress: false
|
cancel-in-progress: false
|
||||||
|
|
||||||
jobs:
|
env:
|
||||||
redeploy:
|
DEPLOY_HOST: ${{ vars.DEPLOY_HOST || secrets.DEPLOY_HOST }}
|
||||||
runs-on: [self-hosted, linux, arch, homelab, prod]
|
DEPLOY_PORT: ${{ vars.DEPLOY_PORT || secrets.DEPLOY_PORT }}
|
||||||
steps:
|
DEPLOY_USER: ${{ vars.DEPLOY_USER || secrets.DEPLOY_USER }}
|
||||||
- name: Redeploy workstation
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
|
||||||
DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
|
|
||||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
|
||||||
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
|
|
||||||
DEPLOY_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
DEPLOY_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||||
# Set APPLY_PRUNE=true to enable kubectl apply --prune. Requires every
|
DEPLOY_KNOWN_HOSTS: ${{ vars.DEPLOY_KNOWN_HOSTS }}
|
||||||
# manifest to carry label app.kubernetes.io/managed-by=homelab-deploy,
|
DEPLOY_RUN_ID: ${{ github.run_id }}-${{ github.run_attempt || 1 }}
|
||||||
# otherwise previously applied resources get deleted on the next run.
|
DEPLOY_MODE: ${{ inputs.deploy_mode || 'changed' }}
|
||||||
APPLY_PRUNE: ${{ vars.APPLY_PRUNE }}
|
REFRESH_IMAGES: ${{ inputs.refresh_images && 'true' || 'false' }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
gate:
|
||||||
|
if: >-
|
||||||
|
github.ref == 'refs/heads/main' &&
|
||||||
|
(vars.AUTODEPLOY == 'true' || github.event_name == 'workflow_dispatch') &&
|
||||||
|
(github.event_name != 'workflow_run' ||
|
||||||
|
(github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main'))
|
||||||
|
runs-on: homelab
|
||||||
|
timeout-minutes: 10
|
||||||
|
outputs:
|
||||||
|
sha: ${{ steps.release.outputs.sha }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Check successful CI and download the exact commit release
|
||||||
|
id: release
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ github.token }}
|
||||||
|
DEPLOY_REF: ${{ inputs.deploy_ref || 'main' }}
|
||||||
|
EVENT_SHA: ${{ github.event.workflow_run.head_sha }}
|
||||||
|
run: python3 .gitea/workflows/release.py gate --ref "$DEPLOY_REF" --event-sha "$EVENT_SHA"
|
||||||
|
- name: Submit durable deploy to workstation
|
||||||
|
run: bash .gitea/workflows/ssh-run.sh start
|
||||||
|
- name: Write the request result
|
||||||
|
if: always()
|
||||||
|
env:
|
||||||
|
REQUEST_RESULT: ${{ job.status }}
|
||||||
|
CHECKED_SHA: ${{ steps.release.outputs.sha }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
printf '## Deploy request\n\n- Result: **%s**\n- Checked commit: %s\n- Mode: %s\n' "$REQUEST_RESULT" "${CHECKED_SHA:-not checked}" "$DEPLOY_MODE" >>"$GITHUB_STEP_SUMMARY"
|
||||||
: "${DEPLOY_HOST:?missing DEPLOY_HOST}"
|
if [ "$REQUEST_RESULT" != success ]; then
|
||||||
: "${DEPLOY_USER:?missing DEPLOY_USER}"
|
echo 'Open the failed step log. If SSH submission failed, check the remote controller state.' >>"$GITHUB_STEP_SUMMARY"
|
||||||
: "${DEPLOY_KEY:?missing DEPLOY_SSH_KEY}"
|
fi
|
||||||
|
|
||||||
deploy_port="${DEPLOY_PORT:-22}"
|
|
||||||
deploy_path="${DEPLOY_PATH:-/srv/homelab}"
|
|
||||||
|
|
||||||
ssh_key="$RUNNER_TEMP/deploy_key"
|
|
||||||
mkdir -p "$RUNNER_TEMP"
|
|
||||||
printf '%s\n' "$DEPLOY_KEY" > "$ssh_key"
|
|
||||||
chmod 600 "$ssh_key"
|
|
||||||
|
|
||||||
ssh_opts=(
|
|
||||||
-i "$ssh_key"
|
|
||||||
-p "$deploy_port"
|
|
||||||
-o BatchMode=yes
|
|
||||||
-o StrictHostKeyChecking=accept-new
|
|
||||||
)
|
|
||||||
|
|
||||||
ssh "${ssh_opts[@]}" "${DEPLOY_USER}@${DEPLOY_HOST}" \
|
|
||||||
"DEPLOY_PATH=$(printf '%q' \"$deploy_path\") APPLY_PRUNE=$(printf '%q' \"${APPLY_PRUNE:-false}\") bash -se" <<'EOF'
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
repo="${DEPLOY_PATH:-/srv/homelab}"
|
|
||||||
|
|
||||||
if [ ! -d "$repo/.git" ]; then
|
|
||||||
echo "Repository not found at $repo"
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git -C "$repo" fetch origin main
|
apply:
|
||||||
git -C "$repo" reset --hard origin/main
|
needs: [gate]
|
||||||
|
runs-on: homelab
|
||||||
# Runtime selection: a service is k8s-managed when $SERVICE/k8s/active
|
timeout-minutes: 120
|
||||||
# exists. Otherwise it is compose-managed, and only k8s/routing/*
|
steps:
|
||||||
# manifests (external Services / EndpointSlices / ServersTransport /
|
- name: Checkout checked commit
|
||||||
# Ingresses that route to docker backends) are applied.
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
||||||
# migrate: touch SERVICE/k8s/active (+ move routing files up)
|
with:
|
||||||
# rollback: rm SERVICE/k8s/active
|
ref: ${{ needs.gate.outputs.sha }}
|
||||||
collect_k8s() {
|
- name: Follow validation and sequential Kubernetes / Compose apply
|
||||||
find "$1" -type f \( -name '*.yaml' -o -name '*.yml' \) \
|
run: bash .gitea/workflows/ssh-run.sh apply
|
||||||
! -path '*/routing/*' ! -path '*/overlays/*' \
|
- name: Write the deploy result
|
||||||
! -name 'kustomization.y*ml' ! -name '*.example.y*ml' \
|
if: always()
|
||||||
! -name '*values.y*ml' ! -name 'patch-*.y*ml' \
|
run: |
|
||||||
| sort
|
if [ -f .gitea/workflows/ssh-run.sh ]; then
|
||||||
}
|
bash .gitea/workflows/ssh-run.sh summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
collect_k8s_inactive() {
|
echo 'Source checkout failed. The remote deploy state is unknown. Check the job log.' >>"$GITHUB_STEP_SUMMARY"
|
||||||
find "$1" -type f \( -name '*.yaml' -o -name '*.yml' \) \
|
|
||||||
\( -name 'namespace.y*ml' -o -path '*/routing/*' \) \
|
|
||||||
! -path '*/overlays/*' ! -name '*.example.y*ml' \
|
|
||||||
| sort
|
|
||||||
}
|
|
||||||
|
|
||||||
mapfile -t compose_stacks < <(
|
|
||||||
find "$repo" -type f \( -name 'compose.yaml' -o -name 'compose.yml' \) | sort
|
|
||||||
)
|
|
||||||
|
|
||||||
mapfile -t k8s_manifests < <(
|
|
||||||
for kd in $(find "$repo" -type d -name k8s ! -path '*/.git/*' | sort); do
|
|
||||||
if [ -f "$kd/active" ]; then
|
|
||||||
collect_k8s "$kd"
|
|
||||||
else
|
|
||||||
collect_k8s_inactive "$kd"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
)
|
|
||||||
|
|
||||||
echo "== Validate compose stacks =="
|
|
||||||
for cf in "${compose_stacks[@]}"; do
|
|
||||||
dir=$(dirname "$cf")
|
|
||||||
if [ -f "$dir/k8s/active" ]; then
|
|
||||||
echo " skip (k8s-managed): $dir"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
echo " config: $cf"
|
|
||||||
docker compose -f "$cf" config --quiet
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "== Validate k8s manifests (kubectl dry-run) =="
|
|
||||||
for m in "${k8s_manifests[@]}"; do
|
|
||||||
echo " apply --dry-run=client $m"
|
|
||||||
kubectl apply --dry-run=client -f "$m" >/dev/null
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "== Applying Kubernetes manifests =="
|
|
||||||
ns_files=()
|
|
||||||
other_files=()
|
|
||||||
for m in "${k8s_manifests[@]}"; do
|
|
||||||
case "$m" in
|
|
||||||
*/namespace.y?ml) ns_files+=("$m") ;;
|
|
||||||
*) other_files+=("$m") ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
prune_opts=()
|
|
||||||
if [ "${APPLY_PRUNE:-false}" = "true" ]; then
|
|
||||||
prune_opts=(--prune -l app.kubernetes.io/managed-by=homelab-deploy)
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${#ns_files[@]}" -gt 0 ]; then
|
verify:
|
||||||
echo " namespaces first: ${ns_files[*]}"
|
needs: [gate, apply]
|
||||||
kubectl apply -f "${ns_files[@]}"
|
if: always() && needs.gate.result == 'success'
|
||||||
fi
|
runs-on: homelab
|
||||||
if [ -f "$repo/prometheus-stack/k8s/active" ]; then
|
timeout-minutes: 130
|
||||||
echo "== Upgrading kube-prometheus-stack =="
|
steps:
|
||||||
helm upgrade --install prometheus-stack prometheus-community/kube-prometheus-stack \
|
- name: Checkout checked commit
|
||||||
--namespace prometheus \
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
||||||
--version 86.2.3 \
|
with:
|
||||||
--values "$repo/prometheus-stack/k8s/grafana-values.yaml" \
|
ref: ${{ needs.gate.outputs.sha }}
|
||||||
--wait
|
- name: Follow workload verification and recovery
|
||||||
fi
|
run: bash .gitea/workflows/ssh-run.sh verify
|
||||||
if [ -f "$repo/loki/k8s/active" ]; then
|
- name: Write the deploy result
|
||||||
echo "== Upgrading loki/alloy =="
|
if: always()
|
||||||
helm repo add grafana https://grafana.github.io/helm-charts >/dev/null 2>&1 || true
|
run: |
|
||||||
helm repo update grafana >/dev/null 2>&1 || true
|
if [ -f .gitea/workflows/ssh-run.sh ]; then
|
||||||
helm upgrade --install loki grafana/loki \
|
bash .gitea/workflows/ssh-run.sh summary
|
||||||
--version 7.3.0 \
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
--namespace prometheus \
|
echo 'Source checkout failed. The remote deploy state is unknown. Check the job log.' >>"$GITHUB_STEP_SUMMARY"
|
||||||
--values "$repo/loki/k8s/loki-values.yaml" \
|
|
||||||
--wait
|
|
||||||
helm upgrade --install alloy grafana/alloy \
|
|
||||||
--version 1.12.1 \
|
|
||||||
--namespace prometheus \
|
|
||||||
--values "$repo/loki/k8s/alloy-values.yaml" \
|
|
||||||
--wait
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${#other_files[@]}" -gt 0 ]; then
|
smoke:
|
||||||
echo " resources: ${other_files[*]}"
|
needs: [gate, verify]
|
||||||
kubectl apply "${prune_opts[@]}" -f "${other_files[@]}"
|
if: always() && needs.gate.result == 'success'
|
||||||
|
runs-on: homelab
|
||||||
|
timeout-minutes: 15
|
||||||
|
steps:
|
||||||
|
- name: Checkout checked commit
|
||||||
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
||||||
|
with:
|
||||||
|
ref: ${{ needs.gate.outputs.sha }}
|
||||||
|
- name: Follow public route checks
|
||||||
|
run: bash .gitea/workflows/ssh-run.sh smoke
|
||||||
|
- name: Write the deploy result
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
if [ -f .gitea/workflows/ssh-run.sh ]; then
|
||||||
|
bash .gitea/workflows/ssh-run.sh summary
|
||||||
|
elif [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
echo 'Source checkout failed. The remote deploy state is unknown. Check the job log.' >>"$GITHUB_STEP_SUMMARY"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "== Redeploying docker compose stacks =="
|
|
||||||
for cf in "${compose_stacks[@]}"; do
|
|
||||||
dir=$(dirname "$cf")
|
|
||||||
if [ -f "$dir/k8s/active" ]; then
|
|
||||||
echo " skip (k8s-managed): $dir"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
echo " compose: $dir"
|
|
||||||
if grep -Eq '^\s+pull_policy:\s*build\b' "$cf"; then
|
|
||||||
docker compose -f "$cf" build
|
|
||||||
docker compose -f "$cf" push
|
|
||||||
fi
|
|
||||||
docker compose -f "$cf" up -d --pull always --remove-orphans
|
|
||||||
done
|
|
||||||
EOF
|
|
||||||
Executable
+285
@@ -0,0 +1,285 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Installs the pinned CI tools into "$TOOLS_DIR/bin" and echoes that directory
|
||||||
|
# on stdout, so callers can do:
|
||||||
|
#
|
||||||
|
# export PATH="$(bash .gitea/workflows/install-ci-tools.sh kubeconform shellcheck):$PATH"
|
||||||
|
#
|
||||||
|
# Versions come from tool-versions.env next to this script and are kept fresh by
|
||||||
|
# Renovate. Re-running is cheap: an already-installed tool at the pinned version
|
||||||
|
# is left alone.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
# shellcheck source=tool-versions.env
|
||||||
|
. "$here/tool-versions.env"
|
||||||
|
|
||||||
|
TOOLS_DIR="${TOOLS_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/homelab-ci}"
|
||||||
|
BIN_DIR="$TOOLS_DIR/bin"
|
||||||
|
mkdir -p "$BIN_DIR"
|
||||||
|
# A runner may accept overlapping workflows even though each workflow is sequential.
|
||||||
|
exec 9>"$TOOLS_DIR/install.lock"
|
||||||
|
flock -w 300 9
|
||||||
|
export UV_TOOL_DIR="$TOOLS_DIR/uv-tools"
|
||||||
|
export UV_CACHE_DIR="$TOOLS_DIR/uv-cache"
|
||||||
|
# The just-installed tools must resolve inside this script too: callers only
|
||||||
|
# prepend BIN_DIR to PATH after the script exits, so a bare `uv` below would
|
||||||
|
# miss the binary install_uv just placed (exit 127 on a clean runner).
|
||||||
|
export PATH="$BIN_DIR:$PATH"
|
||||||
|
|
||||||
|
arch="$(uname -m)"
|
||||||
|
# Upstream projects disagree on arch spelling: kubeconform and actionlint use
|
||||||
|
# Go names (amd64/arm64), shellcheck uses uname names (x86_64/aarch64), node
|
||||||
|
# uses neither (x64/arm64), and hadolint mixes the two in a single release
|
||||||
|
# (x86_64 but arm64).
|
||||||
|
case "$arch" in
|
||||||
|
x86_64 | amd64)
|
||||||
|
goarch=amd64
|
||||||
|
sharch=x86_64
|
||||||
|
nodearch=x64
|
||||||
|
hadolintarch=x86_64
|
||||||
|
;;
|
||||||
|
aarch64 | arm64)
|
||||||
|
goarch=arm64
|
||||||
|
sharch=aarch64
|
||||||
|
nodearch=arm64
|
||||||
|
hadolintarch=arm64
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "install-ci-tools: unsupported architecture: $arch" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
fetch() {
|
||||||
|
# fetch <url> <dest>
|
||||||
|
if command -v curl >/dev/null 2>&1; then
|
||||||
|
curl -sSLf --connect-timeout 15 --max-time 120 --retry 3 -o "$2" "$1"
|
||||||
|
elif command -v wget >/dev/null 2>&1; then
|
||||||
|
wget -q -O "$2" "$1"
|
||||||
|
else
|
||||||
|
echo "install-ci-tools: neither curl nor wget is available" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# resolve <command>
|
||||||
|
# Absolute path to use for invoking a tool: the copy in BIN_DIR when present,
|
||||||
|
# otherwise the name for PATH lookup. Every version check and every in-script
|
||||||
|
# invocation goes through this, so a tool missing from both places reads as
|
||||||
|
# "not installed" instead of dying with 127 under `set -e`.
|
||||||
|
resolve() {
|
||||||
|
if [ -x "$BIN_DIR/$1" ]; then
|
||||||
|
printf '%s' "$BIN_DIR/$1"
|
||||||
|
else
|
||||||
|
printf '%s' "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# installed_version <command>
|
||||||
|
# Prints the version of an already-installed tool, or nothing. Each tool spells
|
||||||
|
# its version flag differently, hence the case.
|
||||||
|
installed_version() {
|
||||||
|
local bin out
|
||||||
|
bin="$(resolve "$1")"
|
||||||
|
if ! command -v "$bin" >/dev/null 2>&1; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
case "$1" in
|
||||||
|
kubeconform) out="$("$bin" -v 2>/dev/null | head -1 || true)" ;;
|
||||||
|
*) out="$("$bin" --version 2>/dev/null | head -1 || true)" ;;
|
||||||
|
esac
|
||||||
|
printf '%s' "$out"
|
||||||
|
}
|
||||||
|
|
||||||
|
# at_version <command> <expected>
|
||||||
|
at_version() {
|
||||||
|
local version expected="${2#v}"
|
||||||
|
version="$(installed_version "$1")"
|
||||||
|
if [[ "$version" =~ (^|[^0-9.])v?([0-9]+(\.[0-9]+)+) ]]; then
|
||||||
|
[ "${BASH_REMATCH[2]}" = "$expected" ]
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
install_kubeconform() {
|
||||||
|
if at_version kubeconform "v${KUBECONFORM_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
fetch "https://github.com/yannh/kubeconform/releases/download/v${KUBECONFORM_VERSION}/kubeconform-linux-${goarch}.tar.gz" \
|
||||||
|
"$tmp/kubeconform.tar.gz"
|
||||||
|
tar -xzf "$tmp/kubeconform.tar.gz" -C "$tmp" kubeconform
|
||||||
|
install -m 0755 "$tmp/kubeconform" "$BIN_DIR/kubeconform"
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_shellcheck() {
|
||||||
|
if at_version shellcheck "${SHELLCHECK_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
fetch "https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.${sharch}.tar.xz" \
|
||||||
|
"$tmp/shellcheck.tar.xz"
|
||||||
|
tar -xJf "$tmp/shellcheck.tar.xz" -C "$tmp" --strip-components=1 "shellcheck-v${SHELLCHECK_VERSION}/shellcheck"
|
||||||
|
install -m 0755 "$tmp/shellcheck" "$BIN_DIR/shellcheck"
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_jq() {
|
||||||
|
if at_version jq "${JQ_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fetch "https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux-${goarch}" \
|
||||||
|
"$BIN_DIR/jq"
|
||||||
|
chmod 0755 "$BIN_DIR/jq"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_uv() {
|
||||||
|
if at_version uv "${UV_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
# uv release tags carry no leading v, unlike every other tool installed here.
|
||||||
|
fetch "https://github.com/astral-sh/uv/releases/download/${UV_VERSION}/uv-${sharch}-unknown-linux-gnu.tar.gz" \
|
||||||
|
"$tmp/uv.tar.gz"
|
||||||
|
tar -xzf "$tmp/uv.tar.gz" -C "$tmp" --strip-components=1 "uv-${sharch}-unknown-linux-gnu/uv"
|
||||||
|
install -m 0755 "$tmp/uv" "$BIN_DIR/uv"
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_hadolint() {
|
||||||
|
if at_version hadolint "${HADOLINT_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
# A bare binary, no archive: hadolint ships one file per platform.
|
||||||
|
fetch "https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-linux-${hadolintarch}" \
|
||||||
|
"$BIN_DIR/hadolint"
|
||||||
|
chmod 0755 "$BIN_DIR/hadolint"
|
||||||
|
}
|
||||||
|
|
||||||
|
# ruff and yamllint both come from PyPI as wheels, which uv unpacks for us.
|
||||||
|
install_uv_tool() {
|
||||||
|
# <package> <pinned version>
|
||||||
|
if at_version "$1" "$2"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
install_uv
|
||||||
|
UV_TOOL_BIN_DIR="$BIN_DIR" "$BIN_DIR/uv" tool install --force "$1==$2" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
install_ruff() {
|
||||||
|
install_uv_tool ruff "${RUFF_VERSION}"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_yamllint() {
|
||||||
|
install_uv_tool yamllint "${YAMLLINT_VERSION}"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_pip_audit() {
|
||||||
|
install_uv_tool pip-audit "${PIP_AUDIT_VERSION}"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_prettier() {
|
||||||
|
install_node
|
||||||
|
if at_version prettier "${PRETTIER_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
# Not a standalone binary: prettier's entry point requires ../package.json
|
||||||
|
# relative to its own real path, so the package directory has to survive
|
||||||
|
# next to it. Hence a versioned directory plus a relative symlink, rather
|
||||||
|
# than copying the one file out as the other installers do.
|
||||||
|
local dir="$BIN_DIR/prettier-${PRETTIER_VERSION}"
|
||||||
|
if [ ! -f "$dir/package/package.json" ]; then
|
||||||
|
rm -rf "$dir"
|
||||||
|
mkdir -p "$dir"
|
||||||
|
fetch "https://registry.npmjs.org/prettier/-/prettier-${PRETTIER_VERSION}.tgz" "$dir/prettier.tgz"
|
||||||
|
tar -xzf "$dir/prettier.tgz" -C "$dir"
|
||||||
|
rm -f "$dir/prettier.tgz"
|
||||||
|
# npm strips the exec bit from bin/ on the way into the tarball.
|
||||||
|
chmod 0755 "$dir/package/bin/prettier.cjs"
|
||||||
|
fi
|
||||||
|
# Relative, so the whole tree stays valid if TOOLS_DIR is relocated.
|
||||||
|
ln -sfn "prettier-${PRETTIER_VERSION}/package/bin/prettier.cjs" "$BIN_DIR/prettier"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_node() {
|
||||||
|
# npm gets checked by running it, not by looking it up: what matters is that
|
||||||
|
# it answers, so a stub, a half-removed Arch package or a name that resolves
|
||||||
|
# to something broken all have to read as "not installed". The runner's npm
|
||||||
|
# is a symlink into /usr/lib/node_modules/npm, which is exactly the kind of
|
||||||
|
# thing that disappears between runs.
|
||||||
|
if at_version node "v${NODE_VERSION}" && [ -n "$(installed_version npm)" ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
# Same shape as prettier above: the tarball's bin/npm and bin/npx are links
|
||||||
|
# into lib/node_modules, so the whole tree has to survive next to them.
|
||||||
|
local dir="$BIN_DIR/node-${NODE_VERSION}"
|
||||||
|
if [ ! -x "$dir/bin/node" ]; then
|
||||||
|
rm -rf "$dir"
|
||||||
|
mkdir -p "$dir"
|
||||||
|
fetch "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${nodearch}.tar.xz" \
|
||||||
|
"$dir/node.tar.xz"
|
||||||
|
tar -xJf "$dir/node.tar.xz" -C "$dir" --strip-components=1 "node-v${NODE_VERSION}-linux-${nodearch}"
|
||||||
|
rm -f "$dir/node.tar.xz"
|
||||||
|
fi
|
||||||
|
# Relative, so the whole tree stays valid if TOOLS_DIR is relocated.
|
||||||
|
for bin in node npm npx; do
|
||||||
|
ln -sfn "node-${NODE_VERSION}/bin/${bin}" "$BIN_DIR/${bin}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
install_actionlint() {
|
||||||
|
if at_version actionlint "${ACTIONLINT_VERSION}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
fetch "https://github.com/rhysd/actionlint/releases/download/v${ACTIONLINT_VERSION}/actionlint_${ACTIONLINT_VERSION}_linux_${goarch}.tar.gz" \
|
||||||
|
"$tmp/actionlint.tar.gz"
|
||||||
|
tar -xzf "$tmp/actionlint.tar.gz" -C "$tmp" actionlint
|
||||||
|
install -m 0755 "$tmp/actionlint" "$BIN_DIR/actionlint"
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
wanted=("$@")
|
||||||
|
if [ "${#wanted[@]}" -eq 0 ]; then
|
||||||
|
wanted=(node jq kubeconform shellcheck actionlint prettier ruff yamllint hadolint)
|
||||||
|
fi
|
||||||
|
|
||||||
|
for tool in "${wanted[@]}"; do
|
||||||
|
case "$tool" in
|
||||||
|
kubeconform) install_kubeconform ;;
|
||||||
|
shellcheck) install_shellcheck ;;
|
||||||
|
jq) install_jq ;;
|
||||||
|
actionlint) install_actionlint ;;
|
||||||
|
prettier) install_prettier ;;
|
||||||
|
ruff) install_ruff ;;
|
||||||
|
yamllint) install_yamllint ;;
|
||||||
|
pip-audit) install_pip_audit ;;
|
||||||
|
hadolint) install_hadolint ;;
|
||||||
|
node) install_node ;;
|
||||||
|
uv) install_uv ;;
|
||||||
|
*)
|
||||||
|
echo "install-ci-tools: unknown tool: $tool" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
for old in "$BIN_DIR"/node-* "$BIN_DIR"/prettier-*; do
|
||||||
|
[ -d "$old" ] || continue
|
||||||
|
case "$(basename "$old")" in
|
||||||
|
"node-$NODE_VERSION"|"prettier-$PRETTIER_VERSION") ;;
|
||||||
|
*) rm -rf "$old" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
if [ -x "$BIN_DIR/uv" ]; then "$BIN_DIR/uv" cache prune >/dev/null; fi
|
||||||
|
printf '%s\n' "$BIN_DIR"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ "${BASH_SOURCE[0]}" = "$0" ]; then main "$@"; fi
|
||||||
@@ -0,0 +1,516 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""CI release artifacts and the SHA-specific Gitea deployment gate (stdlib only)."""
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import hashlib
|
||||||
|
import io
|
||||||
|
import itertools
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
import urllib.error
|
||||||
|
import urllib.parse
|
||||||
|
import urllib.request
|
||||||
|
import zipfile
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
SHA = re.compile(r'[0-9a-f]{40}')
|
||||||
|
DIGEST = re.compile(r'sha256:[0-9a-f]{64}')
|
||||||
|
IMAGES = {
|
||||||
|
'error-pages': ('errorpages', 'errorpages/Dockerfile'),
|
||||||
|
'forust-homepage': ('homepages', 'homepages/Dockerfile.forust'),
|
||||||
|
'xdfnx-homepage': ('homepages', 'homepages/Dockerfile.xdfnx'),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def command(*args, **kwargs):
|
||||||
|
"""Arguments are passed directly to the executable, never to a shell."""
|
||||||
|
return subprocess.check_output(args, text=True, **kwargs).strip() # noqa: S603, S607
|
||||||
|
|
||||||
|
|
||||||
|
def validate_release(data, sha=None):
|
||||||
|
if data.get('version') != 1 or not SHA.fullmatch(data.get('sha', '')):
|
||||||
|
raise ValueError('Invalid release version or SHA')
|
||||||
|
if sha is not None and data['sha'] != sha:
|
||||||
|
raise ValueError('Release SHA does not match the checked CI commit')
|
||||||
|
expected = {f'gcr.forust.xyz/forust/{name}' for name in IMAGES}
|
||||||
|
if set(data.get('images', {})) != expected:
|
||||||
|
raise ValueError('Release must contain all owned images')
|
||||||
|
if not all(DIGEST.fullmatch(value) for value in data['images'].values()):
|
||||||
|
raise ValueError('Release has an invalid image digest')
|
||||||
|
if set(data.get('inputs', {})) != expected or not all(
|
||||||
|
re.fullmatch(r'[0-9a-f]{64}', value) for value in data['inputs'].values()
|
||||||
|
):
|
||||||
|
raise ValueError('Release has invalid build input fingerprints')
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
class NoRedirect(urllib.request.HTTPRedirectHandler):
|
||||||
|
def redirect_request(self, _req, _fp, _code, _msg, _headers, _newurl):
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
class Gitea:
|
||||||
|
def __init__(self):
|
||||||
|
self.origin = os.environ['GITHUB_SERVER_URL'].rstrip('/')
|
||||||
|
if urllib.parse.urlsplit(self.origin).scheme != 'https':
|
||||||
|
raise ValueError('Gitea API must use HTTPS')
|
||||||
|
self.repository = os.environ['GITHUB_REPOSITORY']
|
||||||
|
if not re.fullmatch(r'[\w.-]+/[\w.-]+', self.repository):
|
||||||
|
raise ValueError('Invalid Gitea repository')
|
||||||
|
self.token = os.environ['GITEA_TOKEN']
|
||||||
|
self.base = f'{self.origin}/api/v1/repos/{self.repository}'
|
||||||
|
|
||||||
|
def request(self, url, *, archive=False):
|
||||||
|
if not url.startswith(self.base + '/'):
|
||||||
|
raise ValueError('Refusing to send the Actions token to another origin')
|
||||||
|
req = urllib.request.Request(url, headers={'Authorization': f'token {self.token}'}) # noqa: S310 -- HTTPS origin validated above
|
||||||
|
opener = urllib.request.build_opener(NoRedirect())
|
||||||
|
try:
|
||||||
|
response = opener.open(req, timeout=30) # noqa: S310
|
||||||
|
except urllib.error.HTTPError as error:
|
||||||
|
if not archive or error.code not in (301, 302, 303, 307, 308):
|
||||||
|
raise RuntimeError(f'Gitea API returned HTTP {error.code}') from None
|
||||||
|
target = urllib.parse.urljoin(url, error.headers['Location'])
|
||||||
|
if urllib.parse.urlsplit(target).scheme != 'https':
|
||||||
|
raise ValueError('Artifact redirect must use HTTPS') from None
|
||||||
|
# Signed storage redirects must never receive the Gitea token.
|
||||||
|
response = urllib.request.urlopen(target, timeout=30) # noqa: S310
|
||||||
|
with response:
|
||||||
|
payload = response.read(8 * 1024 * 1024 + 1)
|
||||||
|
if len(payload) > 8 * 1024 * 1024:
|
||||||
|
raise ValueError('Gitea response exceeds 8 MiB')
|
||||||
|
return payload if archive else json.loads(payload)
|
||||||
|
|
||||||
|
def pages(self, path, key, **params):
|
||||||
|
for page in range(1, 101):
|
||||||
|
query = urllib.parse.urlencode({**params, 'page': page, 'limit': 50})
|
||||||
|
data = self.request(f'{self.base}/{path}?{query}')
|
||||||
|
entries = data[key]
|
||||||
|
yield from entries
|
||||||
|
if len(entries) < 50:
|
||||||
|
return
|
||||||
|
raise RuntimeError('Gitea pagination limit exceeded')
|
||||||
|
|
||||||
|
def successful_runs(self, sha=None):
|
||||||
|
params = {'branch': 'main', 'status': 'success', 'exclude_pull_requests': 'true'}
|
||||||
|
if sha:
|
||||||
|
params['head_sha'] = sha
|
||||||
|
for run in self.pages('actions/workflows/ci.yaml/runs', 'workflow_runs', **params):
|
||||||
|
if (
|
||||||
|
run.get('status') == 'completed'
|
||||||
|
and run.get('conclusion') == 'success'
|
||||||
|
and run.get('head_branch') == 'main'
|
||||||
|
and run.get('event') in ('push', 'workflow_dispatch')
|
||||||
|
and (run.get('repository') or {}).get('full_name') == self.repository
|
||||||
|
and (run.get('head_repository') or run.get('repository') or {}).get('full_name') == self.repository
|
||||||
|
and (sha is None or run.get('head_sha') == sha)
|
||||||
|
):
|
||||||
|
yield run
|
||||||
|
|
||||||
|
def release(self, run):
|
||||||
|
sha = run['head_sha']
|
||||||
|
jobs = list(self.pages(f'actions/runs/{run["id"]}/jobs', 'jobs'))
|
||||||
|
# A green workflow with a skipped build must not authorize a deploy.
|
||||||
|
if not any(job.get('name') == 'build' and job.get('conclusion') == 'success' for job in jobs):
|
||||||
|
raise ValueError('CI build job did not succeed')
|
||||||
|
artifacts = self.request(f'{self.base}/actions/runs/{run["id"]}/artifacts')['artifacts']
|
||||||
|
matching = [a for a in artifacts if a['name'] == f'release-{sha}' and not a.get('expired')]
|
||||||
|
if len(matching) != 1:
|
||||||
|
raise ValueError('CI release artifact is missing, expired or ambiguous; rerun CI')
|
||||||
|
blob = self.request(f'{self.base}/actions/artifacts/{matching[0]["id"]}/zip', archive=True)
|
||||||
|
with zipfile.ZipFile(io.BytesIO(blob)) as archive:
|
||||||
|
files = [entry for entry in archive.infolist() if not entry.is_dir()]
|
||||||
|
if len(files) != 1 or files[0].filename != 'release.json' or files[0].file_size > 256 * 1024:
|
||||||
|
raise ValueError('Unexpected release archive contents')
|
||||||
|
return validate_release(json.loads(archive.read(files[0])), sha)
|
||||||
|
|
||||||
|
|
||||||
|
def fingerprint(context, dockerfile):
|
||||||
|
tree = command('git', 'ls-tree', '-r', 'HEAD', '--', context, dockerfile, '.gitea/workflows/release.py')
|
||||||
|
return hashlib.sha256(tree.encode()).hexdigest()
|
||||||
|
|
||||||
|
|
||||||
|
def gate(output, requested_ref, event_sha):
|
||||||
|
command('git', 'fetch', '--quiet', 'origin', 'main')
|
||||||
|
if event_sha:
|
||||||
|
if not SHA.fullmatch(event_sha):
|
||||||
|
raise ValueError('Invalid workflow_run SHA')
|
||||||
|
sha = event_sha
|
||||||
|
else:
|
||||||
|
if requested_ref == 'main':
|
||||||
|
requested_ref = 'origin/main'
|
||||||
|
sha = command('git', 'rev-parse', '--verify', '--end-of-options', f'{requested_ref}^{{commit}}')
|
||||||
|
if not SHA.fullmatch(sha):
|
||||||
|
raise ValueError('Invalid deploy SHA')
|
||||||
|
command('git', 'merge-base', '--is-ancestor', sha, 'origin/main')
|
||||||
|
api = Gitea()
|
||||||
|
runs = list(api.successful_runs(sha))
|
||||||
|
if not runs:
|
||||||
|
raise ValueError(f'No successful main CI for {sha}; run CI before deploying')
|
||||||
|
release = api.release(max(runs, key=lambda run: run['id']))
|
||||||
|
output.write_text(json.dumps(release, indent=2) + '\n')
|
||||||
|
if os.environ.get('GITHUB_OUTPUT'):
|
||||||
|
with Path(os.environ['GITHUB_OUTPUT']).open('a') as stream:
|
||||||
|
stream.write(f'sha={sha}\n')
|
||||||
|
print(f'CI gate accepted {sha}')
|
||||||
|
|
||||||
|
|
||||||
|
def prepare_images(output):
|
||||||
|
sha = command('git', 'rev-parse', 'HEAD')
|
||||||
|
if sha != os.environ['GITHUB_SHA'] or not SHA.fullmatch(sha):
|
||||||
|
raise ValueError('Build checkout does not match GITHUB_SHA')
|
||||||
|
api = Gitea()
|
||||||
|
previous = None
|
||||||
|
for run in sorted(itertools.islice(api.successful_runs(), 50), key=lambda item: item['id'], reverse=True):
|
||||||
|
if str(run['id']) == os.environ.get('GITHUB_RUN_ID'):
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
previous = api.release(run)
|
||||||
|
break
|
||||||
|
except ValueError:
|
||||||
|
# Expired artifacts only cost a rebuild; mutable tags are never a fallback.
|
||||||
|
continue
|
||||||
|
targets = []
|
||||||
|
for name, (context, dockerfile) in IMAGES.items():
|
||||||
|
image = f'gcr.forust.xyz/forust/{name}'
|
||||||
|
inputs = fingerprint(context, dockerfile)
|
||||||
|
old_digest = (previous or {}).get('images', {}).get(image)
|
||||||
|
targets.append(
|
||||||
|
{
|
||||||
|
'name': name,
|
||||||
|
'image': image,
|
||||||
|
'context': context,
|
||||||
|
'dockerfile': dockerfile,
|
||||||
|
'inputs': inputs,
|
||||||
|
'reuse_digest': old_digest if (previous or {}).get('inputs', {}).get(image) == inputs else None,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
output.write_text(json.dumps({'sha': sha, 'targets': targets}, indent=2) + '\n')
|
||||||
|
if os.environ.get('GITHUB_OUTPUT'):
|
||||||
|
with Path(os.environ['GITHUB_OUTPUT']).open('a') as stream:
|
||||||
|
stream.write('matrix=' + json.dumps({'include': targets}, separators=(',', ':')) + '\n')
|
||||||
|
print(f'Prepared {len(targets)} image jobs; {sum(t["reuse_digest"] is None for t in targets)} require builds')
|
||||||
|
|
||||||
|
|
||||||
|
def checked_plan(path):
|
||||||
|
data = json.loads(path.read_text())
|
||||||
|
sha = command('git', 'rev-parse', 'HEAD')
|
||||||
|
if data.get('sha') != sha or sha != os.environ['GITHUB_SHA'] or not SHA.fullmatch(sha):
|
||||||
|
raise ValueError('Image plan does not match the checked source commit')
|
||||||
|
targets = data.get('targets', [])
|
||||||
|
if sorted(t['name'] for t in targets) != sorted(IMAGES):
|
||||||
|
raise ValueError('Image plan must contain each owned image once')
|
||||||
|
for target in targets:
|
||||||
|
name = target['name']
|
||||||
|
context, dockerfile = IMAGES[name]
|
||||||
|
if (target['context'], target['dockerfile'], target['image']) != (
|
||||||
|
context,
|
||||||
|
dockerfile,
|
||||||
|
f'gcr.forust.xyz/forust/{name}',
|
||||||
|
) or target['inputs'] != fingerprint(context, dockerfile):
|
||||||
|
raise ValueError('Image plan has invalid build inputs')
|
||||||
|
if target['reuse_digest'] is not None and not DIGEST.fullmatch(target['reuse_digest']):
|
||||||
|
raise ValueError('Image plan has an invalid reuse digest')
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
def build_images(output, report, name, plan):
|
||||||
|
data = checked_plan(plan)
|
||||||
|
sha = data['sha']
|
||||||
|
target = next(t for t in data['targets'] if t['name'] == name)
|
||||||
|
context, dockerfile = IMAGES[name]
|
||||||
|
docker_config = tempfile.mkdtemp(prefix='homelab-registry-')
|
||||||
|
builder_config = Path.home() / '.cache/homelab-ci/buildx'
|
||||||
|
builder_config.mkdir(parents=True, exist_ok=True)
|
||||||
|
env = {**os.environ, 'DOCKER_CONFIG': docker_config, 'BUILDX_CONFIG': str(builder_config)}
|
||||||
|
try:
|
||||||
|
report['phase'] = 'Registry login'
|
||||||
|
subprocess.run( # noqa: S603, S607
|
||||||
|
[
|
||||||
|
shutil.which('docker') or '/usr/bin/docker',
|
||||||
|
'login',
|
||||||
|
'gcr.forust.xyz',
|
||||||
|
'-u',
|
||||||
|
os.environ['REGISTRY_USERNAME'],
|
||||||
|
'--password-stdin',
|
||||||
|
],
|
||||||
|
input=os.environ['REGISTRY_PASSWORD'],
|
||||||
|
text=True,
|
||||||
|
check=True,
|
||||||
|
env=env,
|
||||||
|
)
|
||||||
|
report['phase'] = 'Prepare the builder'
|
||||||
|
builder = 'homelab-ci'
|
||||||
|
versions = dict(
|
||||||
|
re.findall(r'^([A-Z_]+)="([^"\n]+)"$', Path('.gitea/workflows/tool-versions.env').read_text(), re.MULTILINE)
|
||||||
|
)
|
||||||
|
image = versions['BUILDKIT_IMAGE']
|
||||||
|
signature = builder_config / 'homelab-ci-image'
|
||||||
|
exists = (
|
||||||
|
subprocess.run( # noqa: S603
|
||||||
|
[shutil.which('docker') or '/usr/bin/docker', 'buildx', 'inspect', builder],
|
||||||
|
capture_output=True,
|
||||||
|
env=env,
|
||||||
|
).returncode
|
||||||
|
== 0
|
||||||
|
)
|
||||||
|
if exists and (not signature.exists() or signature.read_text().strip() != image):
|
||||||
|
command('docker', 'buildx', 'rm', '--keep-state', builder, env=env)
|
||||||
|
exists = False
|
||||||
|
if not exists:
|
||||||
|
command(
|
||||||
|
'docker',
|
||||||
|
'buildx',
|
||||||
|
'create',
|
||||||
|
'--name',
|
||||||
|
builder,
|
||||||
|
'--driver',
|
||||||
|
'docker-container',
|
||||||
|
'--driver-opt',
|
||||||
|
f'image={image}',
|
||||||
|
'--buildkitd-config',
|
||||||
|
'.gitea/runner/buildkitd.toml',
|
||||||
|
env=env,
|
||||||
|
)
|
||||||
|
signature.write_text(image + '\n')
|
||||||
|
release = {'version': 1, 'sha': sha, 'images': {}, 'inputs': {}}
|
||||||
|
report['images'] = release['images']
|
||||||
|
report['phase'] = f'Build or reuse {name}'
|
||||||
|
report['current'] = name
|
||||||
|
image = f'gcr.forust.xyz/forust/{name}'
|
||||||
|
inputs = target['inputs']
|
||||||
|
old_digest = target['reuse_digest']
|
||||||
|
exists = False
|
||||||
|
if old_digest:
|
||||||
|
exists = (
|
||||||
|
subprocess.run( # noqa: S603, S607
|
||||||
|
[
|
||||||
|
shutil.which('docker') or '/usr/bin/docker',
|
||||||
|
'buildx',
|
||||||
|
'imagetools',
|
||||||
|
'inspect',
|
||||||
|
f'{image}@{old_digest}',
|
||||||
|
],
|
||||||
|
capture_output=True,
|
||||||
|
env=env,
|
||||||
|
timeout=60,
|
||||||
|
).returncode
|
||||||
|
== 0
|
||||||
|
)
|
||||||
|
if exists:
|
||||||
|
print(f'Reuse {name}: inputs unchanged')
|
||||||
|
digest = old_digest
|
||||||
|
report['reused'].append(name)
|
||||||
|
else:
|
||||||
|
print(f'Build {name}', flush=True)
|
||||||
|
metadata = Path(docker_config) / 'metadata.json'
|
||||||
|
command(
|
||||||
|
'docker',
|
||||||
|
'buildx',
|
||||||
|
'build',
|
||||||
|
'--builder',
|
||||||
|
builder,
|
||||||
|
'--platform',
|
||||||
|
'linux/amd64',
|
||||||
|
'--provenance=false',
|
||||||
|
'--cache-from',
|
||||||
|
f'type=registry,ref={image}:buildcache',
|
||||||
|
'--cache-to',
|
||||||
|
f'type=registry,ref={image}:buildcache,mode=max',
|
||||||
|
'--output',
|
||||||
|
f'type=image,name={image},push-by-digest=true,name-canonical=true,push=true',
|
||||||
|
'--metadata-file',
|
||||||
|
str(metadata),
|
||||||
|
'--file',
|
||||||
|
dockerfile,
|
||||||
|
context,
|
||||||
|
env=env,
|
||||||
|
)
|
||||||
|
digest = json.loads(metadata.read_text())['containerimage.digest']
|
||||||
|
report['built'].append(name)
|
||||||
|
release['images'][image] = digest
|
||||||
|
release['inputs'][image] = inputs
|
||||||
|
if not DIGEST.fullmatch(digest):
|
||||||
|
raise ValueError('Image job returned an invalid digest')
|
||||||
|
output.write_text(json.dumps(release, indent=2) + '\n')
|
||||||
|
report['current'] = None
|
||||||
|
report['phase'] = 'Release file saved'
|
||||||
|
finally:
|
||||||
|
# Cleanup errors must neither leak credentials nor mask the original build error.
|
||||||
|
try:
|
||||||
|
subprocess.run( # noqa: S603
|
||||||
|
[
|
||||||
|
shutil.which('docker') or '/usr/bin/docker',
|
||||||
|
'buildx',
|
||||||
|
'prune',
|
||||||
|
'--builder',
|
||||||
|
'homelab-ci',
|
||||||
|
'--force',
|
||||||
|
'--max-used-space',
|
||||||
|
'1gb',
|
||||||
|
],
|
||||||
|
env=env,
|
||||||
|
timeout=60,
|
||||||
|
)
|
||||||
|
except (OSError, subprocess.TimeoutExpired):
|
||||||
|
print('CI builder cache cleanup deferred', flush=True)
|
||||||
|
finally:
|
||||||
|
shutil.rmtree(docker_config)
|
||||||
|
|
||||||
|
|
||||||
|
def write_summary(lines):
|
||||||
|
path = os.environ.get('GITHUB_STEP_SUMMARY')
|
||||||
|
if path:
|
||||||
|
try:
|
||||||
|
with Path(path).open('a') as stream:
|
||||||
|
stream.write('\n'.join(lines) + '\n\n')
|
||||||
|
except OSError:
|
||||||
|
print('WARNING: cannot write the job summary')
|
||||||
|
|
||||||
|
|
||||||
|
def check_summary():
|
||||||
|
lines = [
|
||||||
|
f'## {os.environ["SUMMARY_CHECK"]}',
|
||||||
|
'',
|
||||||
|
f'- Commit: `{os.environ.get("GITHUB_SHA", "unknown")}`',
|
||||||
|
f'- Result: **{os.environ["SUMMARY_RESULT"]}**',
|
||||||
|
]
|
||||||
|
if os.environ.get('SUMMARY_FAILED_STEP'):
|
||||||
|
lines.append(f'- Failed step: {os.environ["SUMMARY_FAILED_STEP"]}')
|
||||||
|
if os.environ['SUMMARY_RESULT'] != 'success':
|
||||||
|
lines.append('- Open the failed step log for the error details.')
|
||||||
|
write_summary(lines)
|
||||||
|
|
||||||
|
|
||||||
|
def build(output, name, plan):
|
||||||
|
report = {'phase': 'Check the source commit', 'current': None, 'built': [], 'reused': [], 'images': {}}
|
||||||
|
result = 'failure'
|
||||||
|
try:
|
||||||
|
build_images(output, report, name, plan)
|
||||||
|
result = 'success'
|
||||||
|
finally:
|
||||||
|
lines = [
|
||||||
|
f'## Image release `{os.environ.get("GITHUB_SHA", "unknown")}`',
|
||||||
|
'',
|
||||||
|
f'- Result: **{result}**',
|
||||||
|
f'- Last stage: {report["phase"]}',
|
||||||
|
]
|
||||||
|
if result == 'failure':
|
||||||
|
lines.append('- No release from this build can be deployed. Open the failed step log.')
|
||||||
|
if report['current']:
|
||||||
|
lines.append(f'- Image at the failure: `{report["current"]}`')
|
||||||
|
for title, key in (('Built', 'built'), ('Reused from successful CI', 'reused')):
|
||||||
|
lines.extend(['', f'### {title}'])
|
||||||
|
lines.extend(f'- `{name}`' for name in report[key])
|
||||||
|
if not report[key]:
|
||||||
|
lines.append('- None')
|
||||||
|
lines.extend(['', '### Completed image digests'])
|
||||||
|
lines.extend(f'- `{image}@{digest}`' for image, digest in report['images'].items())
|
||||||
|
if not report['images']:
|
||||||
|
lines.append('- None')
|
||||||
|
write_summary(lines)
|
||||||
|
|
||||||
|
|
||||||
|
def render(stream, destination):
|
||||||
|
release = validate_release(json.loads(Path(os.environ['RELEASE_FILE']).read_text()), os.environ['DEPLOY_SHA'])
|
||||||
|
image_line = re.compile(
|
||||||
|
r"^(\s*(?:-\s*)?image:\s*)(['\"]?)(gcr\.forust\.xyz/forust/[\w.-]+)(?::[\w.-]+|@sha256:[0-9a-f]{64})\2(\s*(?:#.*)?)$"
|
||||||
|
)
|
||||||
|
rendered = []
|
||||||
|
for line in stream:
|
||||||
|
match = image_line.fullmatch(line.rstrip('\n'))
|
||||||
|
if match:
|
||||||
|
prefix, quote, image, tail = match.groups()
|
||||||
|
if image not in release['images']:
|
||||||
|
raise ValueError(f'Owned image missing from checked release: {image}')
|
||||||
|
line = f'{prefix}{quote}{image}@{release["images"][image]}{quote}{tail}\n'
|
||||||
|
elif re.match(r'\s*(?:-\s*)?image:', line) and 'gcr.forust.xyz/forust/' in line:
|
||||||
|
raise ValueError('Unsupported owned image syntax; refusing to apply a mutable tag')
|
||||||
|
rendered.append(line)
|
||||||
|
destination.writelines(rendered)
|
||||||
|
|
||||||
|
|
||||||
|
def finalize_images(output, fragments, plan):
|
||||||
|
data = checked_plan(plan)
|
||||||
|
sha = data['sha']
|
||||||
|
release = {'version': 1, 'sha': sha, 'images': {}, 'inputs': {}}
|
||||||
|
for name in IMAGES:
|
||||||
|
fragment = json.loads((fragments / f'image-{name}' / 'image.json').read_text())
|
||||||
|
image = f'gcr.forust.xyz/forust/{name}'
|
||||||
|
if fragment.get('sha') != sha or fragment.get('version') != 1 or set(fragment.get('images', {})) != {image}:
|
||||||
|
raise ValueError('Image job artifact is missing or belongs to another commit')
|
||||||
|
target = next(t for t in data['targets'] if t['name'] == name)
|
||||||
|
if fragment.get('inputs') != {image: target['inputs']}:
|
||||||
|
raise ValueError('Image artifact does not match the build plan')
|
||||||
|
release['images'].update(fragment['images'])
|
||||||
|
release['inputs'].update(fragment['inputs'])
|
||||||
|
validate_release(release, sha)
|
||||||
|
# Only a complete set of successful image jobs can publish the release tags.
|
||||||
|
docker_config = tempfile.mkdtemp(prefix='homelab-registry-')
|
||||||
|
env = {**os.environ, 'DOCKER_CONFIG': docker_config}
|
||||||
|
try:
|
||||||
|
subprocess.run( # noqa: S603, S607
|
||||||
|
[
|
||||||
|
shutil.which('docker') or '/usr/bin/docker',
|
||||||
|
'login',
|
||||||
|
'gcr.forust.xyz',
|
||||||
|
'-u',
|
||||||
|
os.environ['REGISTRY_USERNAME'],
|
||||||
|
'--password-stdin',
|
||||||
|
],
|
||||||
|
input=os.environ['REGISTRY_PASSWORD'],
|
||||||
|
text=True,
|
||||||
|
check=True,
|
||||||
|
env=env,
|
||||||
|
)
|
||||||
|
for image, digest in release['images'].items():
|
||||||
|
command(
|
||||||
|
'docker',
|
||||||
|
'buildx',
|
||||||
|
'imagetools',
|
||||||
|
'create',
|
||||||
|
'--prefer-index=false',
|
||||||
|
'--tag',
|
||||||
|
f'{image}:sha-{sha}',
|
||||||
|
f'{image}@{digest}',
|
||||||
|
env=env,
|
||||||
|
timeout=90,
|
||||||
|
)
|
||||||
|
output.write_text(json.dumps(release, indent=2) + '\n')
|
||||||
|
finally:
|
||||||
|
shutil.rmtree(docker_config)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description=__doc__)
|
||||||
|
parser.add_argument('action', choices=('prepare', 'image', 'finalize', 'gate', 'render', 'check-summary'))
|
||||||
|
parser.add_argument('--output', type=Path, default=Path('release.json'))
|
||||||
|
parser.add_argument('--ref', default='main')
|
||||||
|
parser.add_argument('--event-sha', default='')
|
||||||
|
parser.add_argument('--image', choices=IMAGES)
|
||||||
|
parser.add_argument('--plan', type=Path, default=Path('build-plan.json'))
|
||||||
|
parser.add_argument('--fragments', type=Path, default=Path('artifacts'))
|
||||||
|
args = parser.parse_args()
|
||||||
|
if args.action == 'check-summary':
|
||||||
|
check_summary()
|
||||||
|
elif args.action == 'render':
|
||||||
|
render(sys.stdin, sys.stdout)
|
||||||
|
elif args.action == 'gate':
|
||||||
|
gate(args.output, args.ref, args.event_sha)
|
||||||
|
elif args.action == 'prepare':
|
||||||
|
prepare_images(args.output)
|
||||||
|
elif args.action == 'image':
|
||||||
|
if not args.image:
|
||||||
|
parser.error('--image is required')
|
||||||
|
build(args.output, args.image, args.plan)
|
||||||
|
else:
|
||||||
|
finalize_images(args.output, args.fragments, args.plan)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
@@ -1,39 +1,88 @@
|
|||||||
name: renovate-ci
|
name: renovate-ci
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
# Read the workflow from the trusted base branch. PR code runs only on the
|
||||||
|
# unprivileged runner selected below.
|
||||||
|
pull_request_target:
|
||||||
|
paths:
|
||||||
|
- "renovate/**"
|
||||||
|
- ".gitea/workflows/renovate-ci.yaml"
|
||||||
|
- ".gitea/workflows/sync-renovate-configmap.sh"
|
||||||
|
- ".gitea/workflows/compose-lint.sh"
|
||||||
|
- ".gitea/workflows/install-ci-tools.sh"
|
||||||
|
- ".gitea/workflows/tool-versions.env"
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
paths:
|
||||||
|
- "renovate/**"
|
||||||
|
- ".gitea/workflows/renovate-ci.yaml"
|
||||||
|
- ".gitea/workflows/sync-renovate-configmap.sh"
|
||||||
|
- ".gitea/workflows/compose-lint.sh"
|
||||||
|
- ".gitea/workflows/install-ci-tools.sh"
|
||||||
|
- ".gitea/workflows/tool-versions.env"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
validate-renovate:
|
validate-renovate:
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
runs-on: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && 'homelab' || 'homelab-pr' }}
|
||||||
|
timeout-minutes: 20
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
||||||
|
with:
|
||||||
|
ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
|
||||||
|
|
||||||
- name: Validate Renovate Compose draft
|
# renovate/k8s/cronjob.yaml is the single source of truth for the version.
|
||||||
|
- name: Resolve the deployed Renovate version
|
||||||
|
id: image
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
trap 'rm -f renovate/.env' EXIT
|
image="$(sed -n 's|.*image:[[:space:]]*\(renovate/renovate:[^[:space:]]*\).*|\1|p' \
|
||||||
printf '%s\n' \
|
renovate/k8s/cronjob.yaml | head -1)"
|
||||||
'RENOVATE_ENDPOINT=https://gitea.example/api/v1' \
|
if [[ ! "$image" =~ ^renovate/renovate:([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
|
||||||
'RENOVATE_TOKEN=test-token' \
|
echo "::error::expected a pinned renovate/renovate semantic version in renovate/k8s/cronjob.yaml"
|
||||||
'RENOVATE_REPOSITORIES=forust/homelab' \
|
exit 1
|
||||||
> renovate/.env
|
fi
|
||||||
docker compose -f renovate/renovate-compose.yaml config --quiet
|
version="${BASH_REMATCH[1]}"
|
||||||
|
echo "using Renovate $version"
|
||||||
|
printf 'version=%s\n' "$version" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Validate Kubernetes manifests
|
- name: Prepare pinned validation tools
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
docker run --rm \
|
tools_dir="$(bash .gitea/workflows/install-ci-tools.sh kubeconform node)"
|
||||||
-v "$PWD:/work" \
|
echo "$tools_dir" >> "$GITHUB_PATH"
|
||||||
-w /work \
|
|
||||||
ghcr.io/yannh/kubeconform:latest \
|
- name: Validate Renovate repository config
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
RENOVATE_VERSION: ${{ steps.image.outputs.version }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
npm_cache="$(mktemp -d "${RUNNER_TEMP:-/tmp}/renovate-npm-cache.XXXXXXXX")"
|
||||||
|
trap 'rm -rf "$npm_cache"' EXIT
|
||||||
|
NPM_CONFIG_CACHE="$npm_cache" RENOVATE_CONFIG_FILE="$PWD/renovate/renovate.json" \
|
||||||
|
npm exec --yes --package="renovate@${RENOVATE_VERSION}" -- renovate-config-validator
|
||||||
|
|
||||||
|
# The CronJob cannot read the repository, so renovate/k8s/configmap.yaml
|
||||||
|
# carries an inlined copy of the config. Fail if it no longer matches.
|
||||||
|
- name: Check the generated Renovate ConfigMap
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
./.gitea/workflows/sync-renovate-configmap.sh --check
|
||||||
|
|
||||||
|
- name: Validate Renovate Kubernetes manifests
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
kubeconform \
|
||||||
-strict \
|
-strict \
|
||||||
-ignore-missing-schemas \
|
-ignore-missing-schemas \
|
||||||
-summary \
|
-summary \
|
||||||
@@ -41,12 +90,11 @@ jobs:
|
|||||||
renovate/k8s/configmap.yaml \
|
renovate/k8s/configmap.yaml \
|
||||||
renovate/k8s/cronjob.yaml
|
renovate/k8s/cronjob.yaml
|
||||||
|
|
||||||
- name: Validate Renovate repository config
|
- name: Validate Renovate Compose file
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
docker run --rm \
|
source .gitea/workflows/compose-lint.sh
|
||||||
-v "$PWD:/work" \
|
mapfile -t safe_flags < <(compose_safe_flags)
|
||||||
-w /work \
|
validate_compose_file renovate/renovate-compose.yaml \
|
||||||
renovate/renovate:44.103.0 \
|
${safe_flags[@]+"${safe_flags[@]}"}
|
||||||
renovate-config-validator renovate.json
|
|
||||||
@@ -21,25 +21,53 @@ on:
|
|||||||
default: false
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
||||||
|
# Renovate writes through its own bot PAT, passed in as RENOVATE_TOKEN, so the
|
||||||
|
# Actions token is only ever used to read the checkout.
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: renovate-run
|
group: renovate-run
|
||||||
cancel-in-progress: false
|
cancel-in-progress: false
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
run-renovate:
|
run-renovate:
|
||||||
runs-on: [self-hosted, linux, arch, homelab]
|
if: github.ref == 'refs/heads/main'
|
||||||
|
runs-on: homelab
|
||||||
|
timeout-minutes: 60
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
|
||||||
|
with:
|
||||||
|
ref: refs/heads/main
|
||||||
|
|
||||||
- name: Validate Renovate config
|
# renovate/k8s/cronjob.yaml is the single source of truth for the image tag.
|
||||||
|
# Reading it here means this workflow validates and runs the exact version
|
||||||
|
# that is deployed, instead of a copy that silently goes stale.
|
||||||
|
- name: Resolve the deployed Renovate image
|
||||||
|
id: image
|
||||||
shell: bash
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
image="$(sed -n 's|.*image:[[:space:]]*\(renovate/renovate:[^[:space:]]*\).*|\1|p' \
|
||||||
|
renovate/k8s/cronjob.yaml | head -1)"
|
||||||
|
if [[ ! "$image" =~ ^renovate/renovate:[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
echo "::error::expected a pinned renovate/renovate semantic version in renovate/k8s/cronjob.yaml"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "using $image"
|
||||||
|
printf 'image=%s\n' "$image" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Validate Renovate config
|
||||||
|
shell: bash
|
||||||
|
env:
|
||||||
|
RENOVATE_IMAGE: ${{ steps.image.outputs.image }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v "$PWD/renovate/config.js:/opt/renovate/config.js:ro" \
|
-v "$PWD/renovate/renovate.json:/opt/renovate/renovate.json:ro" \
|
||||||
-e RENOVATE_CONFIG_FILE=/opt/renovate/config.js \
|
-e RENOVATE_CONFIG_FILE=/opt/renovate/renovate.json \
|
||||||
renovate/renovate:44.103.0 \
|
"$RENOVATE_IMAGE" \
|
||||||
renovate-config-validator
|
renovate-config-validator
|
||||||
|
|
||||||
- name: Run Renovate
|
- name: Run Renovate
|
||||||
@@ -50,20 +78,21 @@ jobs:
|
|||||||
RENOVATE_REPOSITORIES: ${{ inputs.repositories }}
|
RENOVATE_REPOSITORIES: ${{ inputs.repositories }}
|
||||||
RENOVATE_DRY_RUN: ${{ inputs.dry_run && 'full' || '' }}
|
RENOVATE_DRY_RUN: ${{ inputs.dry_run && 'full' || '' }}
|
||||||
LOG_LEVEL: ${{ inputs.log_level }}
|
LOG_LEVEL: ${{ inputs.log_level }}
|
||||||
|
RENOVATE_IMAGE: ${{ steps.image.outputs.image }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
: "${RENOVATE_TOKEN:?missing RENOVATE_TOKEN secret — add a renovate-bot PAT in repo/org Actions secrets}"
|
: "${RENOVATE_TOKEN:?missing RENOVATE_TOKEN secret — add a renovate-bot PAT in repo/org Actions secrets}"
|
||||||
|
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v "$PWD/renovate/config.js:/opt/renovate/config.js:ro" \
|
-v "$PWD/renovate/renovate.json:/opt/renovate/renovate.json:ro" \
|
||||||
-e RENOVATE_PLATFORM=gitea \
|
-e RENOVATE_PLATFORM=gitea \
|
||||||
-e RENOVATE_ENDPOINT=https://gitea.forust.xyz/api/v1 \
|
-e RENOVATE_ENDPOINT=https://git.forust.xyz/api/v1 \
|
||||||
-e RENOVATE_TOKEN="$RENOVATE_TOKEN" \
|
-e RENOVATE_TOKEN="$RENOVATE_TOKEN" \
|
||||||
-e RENOVATE_GITHUB_COM_TOKEN="${RENOVATE_GITHUB_COM_TOKEN:-}" \
|
-e RENOVATE_GITHUB_COM_TOKEN="${RENOVATE_GITHUB_COM_TOKEN:-}" \
|
||||||
-e RENOVATE_REPOSITORIES="${RENOVATE_REPOSITORIES:-forust/homelab}" \
|
-e RENOVATE_REPOSITORIES="${RENOVATE_REPOSITORIES:-forust/homelab}" \
|
||||||
-e RENOVATE_DRY_RUN="${RENOVATE_DRY_RUN:-}" \
|
-e RENOVATE_DRY_RUN="${RENOVATE_DRY_RUN:-}" \
|
||||||
-e RENOVATE_CONFIG_FILE=/opt/renovate/config.js \
|
-e RENOVATE_CONFIG_FILE=/opt/renovate/renovate.json \
|
||||||
-e RENOVATE_BASE_DIR=/tmp/renovate \
|
-e RENOVATE_BASE_DIR=/tmp/renovate \
|
||||||
-e LOG_LEVEL="${LOG_LEVEL:-info}" \
|
-e LOG_LEVEL="${LOG_LEVEL:-info}" \
|
||||||
renovate/renovate:44.103.0
|
"$RENOVATE_IMAGE"
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# kubectl emits a List for files containing multiple resources.
|
||||||
|
(if .kind == "List" then .items[] else . end)
|
||||||
|
| (.metadata.namespace // "default") as $ns
|
||||||
|
| [
|
||||||
|
(.. | objects
|
||||||
|
| (.secretRef? // empty), (.secretKeyRef? // empty), (.secret? // empty)
|
||||||
|
| select(.optional != true)
|
||||||
|
| .name // .secretName // empty),
|
||||||
|
(.. | objects | .imagePullSecrets[]?.name)
|
||||||
|
]
|
||||||
|
| unique[]
|
||||||
|
| select(. != null and . != "")
|
||||||
|
| "\($ns) \(.)"
|
||||||
Executable
+70
@@ -0,0 +1,70 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# The SSH client submits once and follows durable stages on workstation.
|
||||||
|
set -euo pipefail
|
||||||
|
: "${DEPLOY_HOST:?missing DEPLOY_HOST}"
|
||||||
|
: "${DEPLOY_USER:?missing DEPLOY_USER}"
|
||||||
|
: "${DEPLOY_KEY:?missing DEPLOY_SSH_KEY}"
|
||||||
|
: "${DEPLOY_KNOWN_HOSTS:?configure pinned DEPLOY_KNOWN_HOSTS}"
|
||||||
|
: "${DEPLOY_RUN_ID:?missing DEPLOY_RUN_ID}"
|
||||||
|
[[ "$DEPLOY_USER" =~ ^[A-Za-z_][A-Za-z0-9_.-]*$ ]] || exit 1
|
||||||
|
[[ "$DEPLOY_HOST" =~ ^[A-Za-z0-9_.:-]+$ ]] || exit 1
|
||||||
|
[[ "$DEPLOY_RUN_ID" =~ ^[0-9]+-[0-9]+$ ]] || exit 1
|
||||||
|
[[ "${DEPLOY_PORT:-22}" =~ ^[0-9]+$ ]] || exit 1
|
||||||
|
key_dir="$(mktemp -d "${RUNNER_TEMP:-/tmp}/homelab-deploy-key.XXXXXXXX")"
|
||||||
|
trap 'rm -rf "$key_dir"' EXIT
|
||||||
|
chmod 700 "$key_dir"
|
||||||
|
printf '%s\n' "$DEPLOY_KEY" >"$key_dir/key"
|
||||||
|
printf '%s\n' "$DEPLOY_KNOWN_HOSTS" >"$key_dir/known_hosts"
|
||||||
|
chmod 600 "$key_dir/key" "$key_dir/known_hosts"
|
||||||
|
ssh_opts=(-i "$key_dir/key" -p "${DEPLOY_PORT:-22}" -o BatchMode=yes -o StrictHostKeyChecking=yes
|
||||||
|
-o "UserKnownHostsFile=$key_dir/known_hosts" -o ConnectTimeout=15
|
||||||
|
-o ServerAliveInterval=15 -o ServerAliveCountMax=4)
|
||||||
|
controller=.local/lib/homelab-deploy/controller.py
|
||||||
|
case "${1:?start, apply, verify, smoke or summary required}" in
|
||||||
|
start)
|
||||||
|
python3 - <<'PY' >"$key_dir/request.json"
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
release = json.loads(Path('release.json').read_text())
|
||||||
|
print(json.dumps({'release': release, 'mode': os.environ.get('DEPLOY_MODE', 'changed'),
|
||||||
|
'refresh_images': os.environ.get('REFRESH_IMAGES', 'false') == 'true'}))
|
||||||
|
PY
|
||||||
|
for attempt in 1 2 3; do
|
||||||
|
rc=0
|
||||||
|
# shellcheck disable=SC2029 # The run ID and operation are validated local arguments, not remote variables.
|
||||||
|
ssh "${ssh_opts[@]}" "$DEPLOY_USER@$DEPLOY_HOST" python3 "$controller" start "$DEPLOY_RUN_ID" <"$key_dir/request.json" || rc=$?
|
||||||
|
[ "$rc" -eq 0 ] && exit 0
|
||||||
|
[ "$rc" -eq 255 ] || exit "$rc"
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
exit "$rc"
|
||||||
|
;;
|
||||||
|
apply|verify|smoke)
|
||||||
|
result=0
|
||||||
|
for attempt in 1 2 3; do
|
||||||
|
rc=0
|
||||||
|
# shellcheck disable=SC2029 # The run ID and operation are validated local arguments, not remote variables.
|
||||||
|
ssh "${ssh_opts[@]}" "$DEPLOY_USER@$DEPLOY_HOST" python3 "$controller" follow "$DEPLOY_RUN_ID" "$1" || rc=$?
|
||||||
|
[ "$rc" -eq 0 ] && break
|
||||||
|
[ "$rc" -eq 255 ] || { result="$rc"; break; }
|
||||||
|
echo "SSH disconnected; reconnecting to the existing deploy ($attempt/3)"
|
||||||
|
if [ "$attempt" -eq 3 ]; then result=255; break; fi
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
exit "$result"
|
||||||
|
;;
|
||||||
|
summary)
|
||||||
|
if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
|
||||||
|
rc=0
|
||||||
|
# shellcheck disable=SC2029 # The run ID is validated above.
|
||||||
|
ssh "${ssh_opts[@]}" "$DEPLOY_USER@$DEPLOY_HOST" python3 "$controller" summary "$DEPLOY_RUN_ID" >"$key_dir/deploy-summary.md" || rc=$?
|
||||||
|
if [ "$rc" -eq 0 ]; then
|
||||||
|
cat "$key_dir/deploy-summary.md" >>"$GITHUB_STEP_SUMMARY" || echo "WARNING: cannot write the deploy summary"
|
||||||
|
else
|
||||||
|
echo 'Deploy summary is unavailable. The SSH connection failed or the controller did not respond. Check the job log.' >>"$GITHUB_STEP_SUMMARY" || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*) echo "Unknown SSH operation: $1" >&2; exit 1 ;;
|
||||||
|
esac
|
||||||
Executable
+55
@@ -0,0 +1,55 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Regenerates renovate/k8s/configmap.yaml from renovate/renovate.json.
|
||||||
|
#
|
||||||
|
# renovate/renovate.json is the single source of truth: the CronJob, the Compose
|
||||||
|
# file and the renovate-run workflow all mount that exact file. A ConfigMap cannot
|
||||||
|
# read a file from the repository, so the same bytes are inlined here as a literal
|
||||||
|
# block. This script keeps the copy honest:
|
||||||
|
#
|
||||||
|
# .gitea/workflows/sync-renovate-configmap.sh # rewrite in place
|
||||||
|
# .gitea/workflows/sync-renovate-configmap.sh --check # fail if out of date
|
||||||
|
#
|
||||||
|
# renovate-ci runs the --check form on every PR and push, so a config change that
|
||||||
|
# forgets to regenerate the ConfigMap cannot be merged.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
repo="$(git -C "$here" rev-parse --show-toplevel)"
|
||||||
|
|
||||||
|
src="$repo/renovate/renovate.json"
|
||||||
|
dst="$repo/renovate/k8s/configmap.yaml"
|
||||||
|
[ -f "$src" ] || {
|
||||||
|
echo "missing $src" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
cat <<'HEADER'
|
||||||
|
# GENERATED FILE - do not edit by hand.
|
||||||
|
# Source: renovate/renovate.json
|
||||||
|
# Regenerate: .gitea/workflows/sync-renovate-configmap.sh
|
||||||
|
# Verify: .gitea/workflows/sync-renovate-configmap.sh --check
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: renovate-config
|
||||||
|
namespace: renovate
|
||||||
|
data:
|
||||||
|
renovate.json: |
|
||||||
|
HEADER
|
||||||
|
sed 's/^/ /' "$src"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ "${1:-}" = "--check" ]; then
|
||||||
|
if ! diff -u "$dst" <(render) >/dev/null 2>&1; then
|
||||||
|
echo "ERROR: $dst is out of sync with renovate/renovate.json"
|
||||||
|
echo "Run: .gitea/workflows/sync-renovate-configmap.sh"
|
||||||
|
diff -u "$dst" <(render) || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "renovate/k8s/configmap.yaml is in sync with renovate/renovate.json"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
render >"$dst"
|
||||||
|
echo "wrote $dst"
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
# Pinned versions of the CI tools installed by install-ci-tools.sh.
|
||||||
|
# Renovate keeps these up to date (see customManagers in renovate/renovate.json).
|
||||||
|
#
|
||||||
|
# Every version here except NODE_VERSION matches what was already installed on
|
||||||
|
# the runner, so pinning them changes what CI does not at all. It changes what
|
||||||
|
# CI does when the runner is rebuilt with something else: today
|
||||||
|
# install-ci-tools.sh finds the pinned version already on PATH and installs
|
||||||
|
# nothing, and a runner that drifts gets the pinned one installed over it.
|
||||||
|
#
|
||||||
|
# The renovate image version is NOT pinned here: renovate/k8s/cronjob.yaml is the
|
||||||
|
# single source of truth and the workflows read the tag from it, so there is
|
||||||
|
# nothing to drift.
|
||||||
|
ACTIONLINT_VERSION="1.7.7"
|
||||||
|
SHELLCHECK_VERSION="0.11.0"
|
||||||
|
KUBECONFORM_VERSION="0.8.0"
|
||||||
|
PRETTIER_VERSION="3.8.1"
|
||||||
|
RUFF_VERSION="0.16.8"
|
||||||
|
YAMLLINT_VERSION="1.38.0"
|
||||||
|
HADOLINT_VERSION="2.14.0"
|
||||||
|
# pip-audit reads the advisory database over the network, so a floating version
|
||||||
|
# would make the same commit report different things on different days. Pin it
|
||||||
|
# like the rest: the advisories themselves are the moving part, not the tool.
|
||||||
|
PIP_AUDIT_VERSION="2.10.1"
|
||||||
|
# uv builds the throwaway venv the pytest job runs in, and unpacks the PyPI
|
||||||
|
# wheels for ruff, yamllint and pip-audit.
|
||||||
|
UV_VERSION="0.12.17"
|
||||||
|
# node runs `npm ci` for the frontend tests and the npm audit, and it is the one
|
||||||
|
# pin here that does NOT come from the runner: the runner's system node is a
|
||||||
|
# rolling Arch package (it was node 26 with no npm at all when this was pinned),
|
||||||
|
# and the panel image is node:22-alpine. Pinned to the image's major on purpose,
|
||||||
|
# so the tree that gets tested is the tree that gets built. Renovate keeps this
|
||||||
|
# in step with the Dockerfile's node: tag via the "node runtime" group.
|
||||||
|
NODE_VERSION="22.23.3"
|
||||||
|
|
||||||
|
# Secret-reference regression tests parse rendered Kubernetes objects.
|
||||||
|
JQ_VERSION="1.8.1"
|
||||||
|
|
||||||
|
# BuildKit is the only auxiliary CI container; jobs themselves stay on the host.
|
||||||
|
BUILDKIT_IMAGE="moby/buildkit:v0.33.1"
|
||||||
+9
-1
@@ -21,6 +21,9 @@ checkmk/checkmk/*
|
|||||||
downtify/Downtify_downloads
|
downtify/Downtify_downloads
|
||||||
headscale/config/*
|
headscale/config/*
|
||||||
headscale/data/*
|
headscale/data/*
|
||||||
|
# NetBird local hostnames and generated secrets
|
||||||
|
netbird/.env
|
||||||
|
netbird/secrets/
|
||||||
searxng/core-config/*
|
searxng/core-config/*
|
||||||
|
|
||||||
# Steaming services files
|
# Steaming services files
|
||||||
@@ -91,8 +94,9 @@ replacements.txt
|
|||||||
.idea
|
.idea
|
||||||
|
|
||||||
# Temp files
|
# Temp files
|
||||||
edu_master/temp/
|
|
||||||
temp/*
|
temp/*
|
||||||
|
# Local-only tooling scratch space (pinned CI tools, verification scripts)
|
||||||
|
tmp/
|
||||||
|
|
||||||
# Environment
|
# Environment
|
||||||
.env
|
.env
|
||||||
@@ -104,6 +108,10 @@ temp/*
|
|||||||
# kubernetes
|
# kubernetes
|
||||||
*/k8s/*secret*
|
*/k8s/*secret*
|
||||||
!*/k8s/*secret*.example
|
!*/k8s/*secret*.example
|
||||||
|
**/k8s/*secret*
|
||||||
|
!**/k8s/*secret*.example
|
||||||
|
# Local-only tweaks, not for upstream
|
||||||
|
prometheus-stack/k8s/grafana-values.yaml
|
||||||
traefik/k8s/local-tls.yaml
|
traefik/k8s/local-tls.yaml
|
||||||
converters/k8s/config.yaml
|
converters/k8s/config.yaml
|
||||||
convertx/k8s/config.yaml
|
convertx/k8s/config.yaml
|
||||||
@@ -31,7 +31,7 @@ services:
|
|||||||
- "traefik.http.routers.adguard-dev.entrypoints=websecure"
|
- "traefik.http.routers.adguard-dev.entrypoints=websecure"
|
||||||
- "traefik.http.routers.adguard-dev.tls=true"
|
- "traefik.http.routers.adguard-dev.tls=true"
|
||||||
# DoH Router
|
# DoH Router
|
||||||
- "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz` || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`))"
|
- "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`)"
|
||||||
- "traefik.http.routers.dns-over-https.entrypoints=websecure"
|
- "traefik.http.routers.dns-over-https.entrypoints=websecure"
|
||||||
- "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt"
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: adguard-deployment
|
name: adguard-deployment
|
||||||
namespace: adguard
|
namespace: adguard
|
||||||
spec:
|
spec:
|
||||||
@@ -58,6 +60,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: adguard
|
app: adguard
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -71,7 +75,7 @@ spec:
|
|||||||
memory: "1.5Gi"
|
memory: "1.5Gi"
|
||||||
cpu: "300m"
|
cpu: "300m"
|
||||||
requests:
|
requests:
|
||||||
memory: "500Mi"
|
memory: "512Mi"
|
||||||
cpu: "50m"
|
cpu: "50m"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 3000
|
- containerPort: 3000
|
||||||
@@ -80,6 +84,13 @@ spec:
|
|||||||
name: dns
|
name: dns
|
||||||
- containerPort: 853
|
- containerPort: 853
|
||||||
name: dot
|
name: dot
|
||||||
|
readinessProbe:
|
||||||
|
tcpSocket:
|
||||||
|
port: dns
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 5
|
||||||
|
successThreshold: 1
|
||||||
|
failureThreshold: 3
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: adguard-data
|
- name: adguard-data
|
||||||
mountPath: /opt/adguardhome/work
|
mountPath: /opt/adguardhome/work
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: adguard-certs
|
||||||
|
namespace: adguard
|
||||||
|
spec:
|
||||||
|
secretName: adguard-certs
|
||||||
|
dnsNames:
|
||||||
|
- dns.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -7,21 +7,18 @@ spec:
|
|||||||
entryPoints:
|
entryPoints:
|
||||||
- websecure
|
- websecure
|
||||||
routes:
|
routes:
|
||||||
- match: Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)
|
- match: Host(`dns.forust.xyz`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
services:
|
services:
|
||||||
- name: adguard-service
|
- name: adguard-service
|
||||||
port: 3000
|
port: 3000
|
||||||
- match: (Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`)
|
- match: (Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
services:
|
services:
|
||||||
- name: adguard-service
|
- name: adguard-service
|
||||||
port: 3000
|
port: 3000
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: adguard-certs
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -42,3 +39,5 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: adguard-service
|
- name: adguard-service
|
||||||
port: 3000
|
port: 3000
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: adguard
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -27,6 +27,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: authentik-server-deployment
|
name: authentik-server-deployment
|
||||||
namespace: authentik
|
namespace: authentik
|
||||||
spec:
|
spec:
|
||||||
@@ -34,6 +36,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: authentik-server
|
app: authentik-server
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -52,8 +56,8 @@ spec:
|
|||||||
- containerPort: 9000
|
- containerPort: 9000
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "700Mi"
|
memory: "768Mi"
|
||||||
cpu: "300m"
|
cpu: "100m"
|
||||||
limits:
|
limits:
|
||||||
memory: "1.5Gi"
|
memory: "1.5Gi"
|
||||||
cpu: "1000m"
|
cpu: "1000m"
|
||||||
@@ -61,6 +65,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: authentik-worker-deployment
|
name: authentik-worker-deployment
|
||||||
namespace: authentik
|
namespace: authentik
|
||||||
spec:
|
spec:
|
||||||
@@ -68,6 +74,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: authentik-worker
|
app: authentik-worker
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -86,8 +94,8 @@ spec:
|
|||||||
name: authentik-secrets
|
name: authentik-secrets
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "512Mi"
|
memory: "320Mi"
|
||||||
cpu: "300m"
|
cpu: "100m"
|
||||||
limits:
|
limits:
|
||||||
memory: "1Gi"
|
memory: "768Mi"
|
||||||
cpu: "700m"
|
cpu: "700m"
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: authentik-prod-tls
|
||||||
|
namespace: authentik
|
||||||
|
spec:
|
||||||
|
secretName: authentik-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- auth.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: authentik
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -9,14 +9,11 @@ spec:
|
|||||||
routes:
|
routes:
|
||||||
- match: Host(`auth.forust.xyz`)
|
- match: Host(`auth.forust.xyz`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
services:
|
services:
|
||||||
- name: authentik-server-service
|
- name: authentik-server-service
|
||||||
port: 9000
|
port: 9000
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: authentik-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -32,3 +29,5 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: authentik-server-service
|
- name: authentik-server-service
|
||||||
port: 9000
|
port: 9000
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
crds:
|
||||||
|
enabled: true
|
||||||
|
prometheus:
|
||||||
|
servicemonitor:
|
||||||
|
enabled: true
|
||||||
|
interval: 60s
|
||||||
|
scrapeTimeout: 30s
|
||||||
|
labels:
|
||||||
|
release: prometheus-stack
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: ClusterIssuer
|
||||||
|
metadata:
|
||||||
|
name: letsencrypt-staging
|
||||||
|
spec:
|
||||||
|
acme:
|
||||||
|
email: bobrovod@national.shitposting.agency
|
||||||
|
server: https://acme-staging-v02.api.letsencrypt.org/directory
|
||||||
|
privateKeySecretRef:
|
||||||
|
name: letsencrypt-staging-account-key
|
||||||
|
solvers:
|
||||||
|
- http01:
|
||||||
|
ingress:
|
||||||
|
class: traefik
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: ClusterIssuer
|
||||||
|
metadata:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
spec:
|
||||||
|
acme:
|
||||||
|
email: bobrovod@national.shitposting.agency
|
||||||
|
server: https://acme-v02.api.letsencrypt.org/directory
|
||||||
|
privateKeySecretRef:
|
||||||
|
name: letsencrypt-prod-account-key
|
||||||
|
solvers:
|
||||||
|
- http01:
|
||||||
|
ingress:
|
||||||
|
class: traefik
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFFjCCAv6gAwIBAgIUetKpTfEDOn2985FFMu6G26itT+wwDQYJKoZIhvcNAQEN
|
||||||
|
BQAwIzEhMB8GA1UEAxMYaG9tZWxhYiBpbnRlcm5hbCByb290IENBMB4XDTI2MDky
|
||||||
|
MzEyNDA0N1oXDTM2MDkyMDEyNDA0N1owIzEhMB8GA1UEAxMYaG9tZWxhYiBpbnRl
|
||||||
|
cm5hbCByb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvmNP
|
||||||
|
ZCOoD8NtNuYJKVXBlTPjX7D7sJCSK5neH7ZbYV5+lmUlEErY8Mik7j37V5k5NfpF
|
||||||
|
Ig85pOjP7RckTPz5V6ek3yaN40s4AL053sN5ZPauDVYjalaEHTgj5sEMqlLACQWI
|
||||||
|
yZmJOZspZykae8dIpQnqCoFpRT4FurJ78v4a0ylnFVLMQn/lyCHedwTjkEdtYWYr
|
||||||
|
ccJy8vQwqkzs/rWvEH1lDqZhennLOrmcCjfonG7D/pruMn4z+6E28p4+ejkRrI6x
|
||||||
|
luak3KnpT1XMeHtgU21hiRGaMDBchHMFgAhnY1qosymKenXvfTZItwgjZbwa1hJI
|
||||||
|
GAiDm+jQDKMjzRZ3rH6Xfc0auUcykNz73PpNu1NGm78nndXwCXcXn1LFKNQJ+r1U
|
||||||
|
sJiyAmUZmXVn4aM4OMf2F38k7wTYIKg7nRGaUkNeKDlNkjA4HvgWw+jwO1KmdHQ/
|
||||||
|
mOem1rosDWHRK01wg+Gga9mQCnhNhxglg3t/UeSic6uOaRsvaz4qkzHq8MbCujVz
|
||||||
|
DpKQjqdikYOAXZOs4KlBLWrS7NaK4NzfSD02pBUErh54ruJfY/bWz9KyXzBD/lQZ
|
||||||
|
VUTKyvUVB0bkVHEdf1jJmX3H4IZRQSF5JPqOBotW6bJI5fEGNBvj9Zxy4nm2WWGz
|
||||||
|
yyP3uWsQz8U/Wdx9nXZLHInTZBsvgLYtKUAWA30CAwEAAaNCMEAwDgYDVR0PAQH/
|
||||||
|
BAQDAgKkMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEkKm2rxPaK6+O9WD80z
|
||||||
|
BLC6F9QsMA0GCSqGSIb3DQEBDQUAA4ICAQAnFyHz97Umf5VIu+dKTJid7C73VugJ
|
||||||
|
TIar/xJBs/4CxP+znBxhJjXygRoyIfzoVGWcB2ZSL//vL78Qlts79K/Imc9a4RFF
|
||||||
|
wMvCxsRXAEQ4TpeWi3ophPNcs4rhsP+gQKQFtnyKP9519bqpfxp0bTqwOV2o18fn
|
||||||
|
za7rlQViiEnNV58j7CVoM9+mJvVVfBEX1Km+GyJL9GadzbIQ7FxClVJZefCbft93
|
||||||
|
zHVk9gDOw8ys1XGSR2OUCyCLinXO6mqS16CmBb2MAKXq/YyH7E0N8iotAPGtfA8V
|
||||||
|
M/0ddy947rY0xCrtECfWwvGQpJS7NRv/Z9b2jCfXrI5LXmL2nfQRg0y9GE4Vjwr+
|
||||||
|
WxtGU5jOeFt0jQ+xRzcgG0Op+qK3x55l5LSo2hOcOVYbiHxcHEJFgwNi1ADeBFwb
|
||||||
|
q/HdysfURSOghqjIpMMAUabBp+DBUg2EUF7pIaUqbdqExFYcr9EYisEMiNsmKmN+
|
||||||
|
8ZbcOeerFKDQj+t/R0bFXa7UBn2UWsjI8zlR74aa2kLDXwtyz/XlO/FlYm66eBFo
|
||||||
|
2/eYUSeU+S4ej+wUAs/dvjF7f190/DUQGuwOTlLTahqWDztmhCk7qzbECu56CwKT
|
||||||
|
E5Ect2P72UleYwdblkVOVd352AmiwEzdOaziIRrPh8uenEknH6JBYPO3mjk7cCg+
|
||||||
|
GPGcNIBctjdXhg==
|
||||||
|
-----END CERTIFICATE-----
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: ClusterIssuer
|
||||||
|
metadata:
|
||||||
|
name: selfsigned
|
||||||
|
spec:
|
||||||
|
selfSigned: {}
|
||||||
|
---
|
||||||
|
# Homelab internal root CA (10y). Install the .crt on clients (see below).
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-ca-root
|
||||||
|
namespace: cert-manager
|
||||||
|
spec:
|
||||||
|
isCA: true
|
||||||
|
commonName: homelab internal root CA
|
||||||
|
duration: 87600h
|
||||||
|
renewBefore: 7200h
|
||||||
|
secretName: internal-ca-root
|
||||||
|
privateKey:
|
||||||
|
algorithm: RSA
|
||||||
|
size: 4096
|
||||||
|
issuerRef:
|
||||||
|
name: selfsigned
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: ClusterIssuer
|
||||||
|
metadata:
|
||||||
|
name: internal-ca
|
||||||
|
spec:
|
||||||
|
ca:
|
||||||
|
secretName: internal-ca-root
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Namespace
|
||||||
|
metadata:
|
||||||
|
name: cert-manager
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: cfddns
|
name: cfddns
|
||||||
labels:
|
labels:
|
||||||
app: cfddns
|
app: cfddns
|
||||||
@@ -9,6 +11,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: cfddns
|
app: cfddns
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -22,10 +26,10 @@ spec:
|
|||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "20Mi"
|
memory: "32Mi"
|
||||||
cpu: "30m"
|
cpu: "30m"
|
||||||
limits:
|
limits:
|
||||||
memory: "64Mi"
|
memory: "128Mi"
|
||||||
cpu: "50m"
|
cpu: "50m"
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: checkmk-prod-tls
|
||||||
|
namespace: checkmk
|
||||||
|
spec:
|
||||||
|
secretName: checkmk-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- cmk.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: checkmk
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -17,6 +17,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: checkmk-deployment
|
name: checkmk-deployment
|
||||||
namespace: checkmk
|
namespace: checkmk
|
||||||
spec:
|
spec:
|
||||||
@@ -24,6 +26,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: checkmk
|
app: checkmk
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|||||||
@@ -9,14 +9,11 @@ spec:
|
|||||||
routes:
|
routes:
|
||||||
- match: Host(`cmk.forust.xyz`)
|
- match: Host(`cmk.forust.xyz`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
services:
|
services:
|
||||||
- name: checkmk-service
|
- name: checkmk-service
|
||||||
port: 5000
|
port: 5000
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: checkmk-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRouteTCP
|
kind: IngressRouteTCP
|
||||||
@@ -48,3 +45,5 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: checkmk-service
|
- name: checkmk-service
|
||||||
port: 5000
|
port: 5000
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: cloudflared
|
name: cloudflared
|
||||||
labels:
|
labels:
|
||||||
app: cloudflared
|
app: cloudflared
|
||||||
@@ -9,6 +11,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: cloudflared
|
app: cloudflared
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -16,7 +20,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: cloudflared
|
- name: cloudflared
|
||||||
image: cloudflare/cloudflared:2026.9.1
|
image: cloudflare/cloudflared:2026.10.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
args:
|
args:
|
||||||
- tunnel
|
- tunnel
|
||||||
@@ -30,8 +34,8 @@ spec:
|
|||||||
key: TUNNEL_TOKEN
|
key: TUNNEL_TOKEN
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "32Mi"
|
memory: "128Mi"
|
||||||
cpu: "30m"
|
cpu: "30m"
|
||||||
limits:
|
limits:
|
||||||
memory: "128Mi"
|
memory: "256Mi"
|
||||||
cpu: "200m"
|
cpu: "200m"
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
convertx:
|
convertx:
|
||||||
container_name: convertx
|
container_name: convertx
|
||||||
image: ghcr.io/c4illin/convertx:v0.18.0
|
image: ghcr.io/c4illin/convertx:v0.19.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "9992:3000"
|
- "9992:3000"
|
||||||
@@ -54,7 +54,7 @@ services:
|
|||||||
- "traefik.http.routers.bentopdf.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.bentopdf.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.routers.bentopdf.tls=true"
|
- "traefik.http.routers.bentopdf.tls=true"
|
||||||
# Local router
|
# Local router
|
||||||
- "traefik.http.routers.bentopdf-local.rule=Host(`pdf.wokstation.internal`)"
|
- "traefik.http.routers.bentopdf-local.rule=Host(`pdf.workstation.internal`)"
|
||||||
- "traefik.http.routers.bentopdf-local.entrypoints=websecure"
|
- "traefik.http.routers.bentopdf-local.entrypoints=websecure"
|
||||||
- "traefik.http.routers.bentopdf-local.tls=true"
|
- "traefik.http.routers.bentopdf-local.tls=true"
|
||||||
# Dev router
|
# Dev router
|
||||||
|
|||||||
@@ -31,12 +31,13 @@ spec:
|
|||||||
name: bentopdf
|
name: bentopdf
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
|
# p95 4M, max 11M over 7 days. Was 50Mi/700Mi.
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "50Mi"
|
memory: "32Mi"
|
||||||
cpu: "50m"
|
cpu: "50m"
|
||||||
ephemeral-storage: "100Mi"
|
ephemeral-storage: "100Mi"
|
||||||
limits:
|
limits:
|
||||||
memory: "700Mi"
|
memory: "128Mi"
|
||||||
cpu: "700m"
|
cpu: "700m"
|
||||||
ephemeral-storage: "5Gi"
|
ephemeral-storage: "5Gi"
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: convertx-prod-tls
|
||||||
|
namespace: converters
|
||||||
|
spec:
|
||||||
|
secretName: convertx-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- forust.xyz
|
||||||
|
- www.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: bentopdf-prod-tls
|
||||||
|
namespace: converters
|
||||||
|
spec:
|
||||||
|
secretName: bentopdf-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- pdf.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: converters
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -13,6 +13,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: convertx-deployment
|
name: convertx-deployment
|
||||||
namespace: converters
|
namespace: converters
|
||||||
spec:
|
spec:
|
||||||
@@ -20,13 +22,15 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: convertx
|
app: convertx
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: convertx
|
app: convertx
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: ghcr.io/c4illin/convertx:v0.18.0
|
- image: ghcr.io/c4illin/convertx:v0.19.0
|
||||||
name: convertx
|
name: convertx
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
@@ -38,13 +42,14 @@ spec:
|
|||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /data
|
- mountPath: /data
|
||||||
name: data
|
name: data
|
||||||
|
# p95 85M, max 136M over 7 days, spikes while converting. Was 250Mi/1.5Gi.
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "250Mi"
|
memory: "128Mi"
|
||||||
cpu: "100m"
|
cpu: "100m"
|
||||||
limits:
|
limits:
|
||||||
cpu: "1500m"
|
cpu: "1500m"
|
||||||
memory: "1.5Gi"
|
memory: "512Mi"
|
||||||
volumes:
|
volumes:
|
||||||
- name: data
|
- name: data
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ spec:
|
|||||||
- name: convertx-service
|
- name: convertx-service
|
||||||
port: 3000
|
port: 3000
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: convertx-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -31,6 +31,9 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: convertx-service
|
- name: convertx-service
|
||||||
port: 3000
|
port: 3000
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -47,7 +50,7 @@ spec:
|
|||||||
- name: bentopdf-service
|
- name: bentopdf-service
|
||||||
port: 8080
|
port: 8080
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: bentopdf-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -63,3 +66,5 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: bentopdf-service
|
- name: bentopdf-service
|
||||||
port: 8080
|
port: 8080
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: Middleware
|
|
||||||
metadata:
|
|
||||||
name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
spec:
|
|
||||||
plugin:
|
|
||||||
crowdsec-bouncer:
|
|
||||||
enabled: true
|
|
||||||
LogLevel: INFO
|
|
||||||
CrowdsecMode: live
|
|
||||||
CrowdsecLapiScheme: http
|
|
||||||
CrowdsecLapiHost: crowdsec-service.crowdsec.svc.cluster.local:8080
|
|
||||||
CrowdsecLapiKeyFile: "/etc/traefik/secrets/traefik-api-key"
|
|
||||||
@@ -16,6 +16,12 @@ agent:
|
|||||||
value: crowdsecurity/traefik crowdsecurity/base-http-scenarios
|
value: crowdsecurity/traefik crowdsecurity/base-http-scenarios
|
||||||
- name: DISABLE_COLLECTIONS
|
- name: DISABLE_COLLECTIONS
|
||||||
value: crowdsecurity/sshd
|
value: crowdsecurity/sshd
|
||||||
|
# Bans on 401/403 bursts hurt more than they protect: with L3 enforcement
|
||||||
|
# a false positive cuts the IP off everything (SSH included), and past
|
||||||
|
# incidents show legit automation (deploy runner, mesh peers, registry
|
||||||
|
# pulls) tripping this probe. Probing/XSS/SQLi/CVE scenarios stay.
|
||||||
|
- name: DISABLE_SCENARIOS
|
||||||
|
value: crowdsecurity/http-generic-bf
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
@@ -58,9 +64,44 @@ config:
|
|||||||
reason: "Mobile IP whitelist"
|
reason: "Mobile IP whitelist"
|
||||||
cidr:
|
cidr:
|
||||||
- "84.245.64.0/18"
|
- "84.245.64.0/18"
|
||||||
|
# CrowdSec's own guidance: CIDR allowlisting belongs at the parser stage.
|
||||||
|
# A parser whitelist discards the event before it reaches a bucket, so
|
||||||
|
# these addresses never produce an overflow and never become a decision.
|
||||||
|
# A postoverflow whitelist is checked only *after* the ban exists, and
|
||||||
|
# the bouncer answers 403 for as long as it does - which is a window we
|
||||||
|
# do not want the deploy sitting in.
|
||||||
|
local-network.yaml: |
|
||||||
|
name: forust/local-network
|
||||||
|
description: "Whitelist loopback, private and VPN networks"
|
||||||
|
whitelist:
|
||||||
|
reason: "Local network"
|
||||||
|
cidr:
|
||||||
|
- "127.0.0.0/8"
|
||||||
|
- "10.0.0.0/8"
|
||||||
|
- "172.16.0.0/12"
|
||||||
|
- "192.168.0.0/16"
|
||||||
|
# CGNAT range (RFC 6598). The workstation and the k0s node live
|
||||||
|
# here on WireGuard, and 100.64.0.0/10 is not covered by the
|
||||||
|
# RFC 1918 blocks above.
|
||||||
|
- "100.64.0.0/10"
|
||||||
|
- "169.254.0.0/16"
|
||||||
|
- "fc00::/7"
|
||||||
|
- "fe80::/10"
|
||||||
|
vps-whitelist.yaml: |
|
||||||
|
name: forust/vps-whitelist
|
||||||
|
description: "Whitelist static VPS"
|
||||||
|
whitelist:
|
||||||
|
reason: "VPS"
|
||||||
|
ip:
|
||||||
|
- "193.181.211.79"
|
||||||
|
|
||||||
postoverflows:
|
postoverflows:
|
||||||
s01-whitelist:
|
s01-whitelist:
|
||||||
|
# The one whitelist that has to stay here: resolving a hostname is a
|
||||||
|
# network call, and the docs put expensive lookups in postoverflows on
|
||||||
|
# purpose - it runs only when a bucket actually overflows.
|
||||||
|
# ddns.forust.xyz is the public home address, not a private one, so
|
||||||
|
# forust/local-network does not cover it.
|
||||||
home-dynamic-ip.yaml: |
|
home-dynamic-ip.yaml: |
|
||||||
name: forust/home-dynamic-ip
|
name: forust/home-dynamic-ip
|
||||||
description: "Whitelist home dynamic IP"
|
description: "Whitelist home dynamic IP"
|
||||||
@@ -69,6 +110,59 @@ config:
|
|||||||
expression:
|
expression:
|
||||||
- evt.Overflow.Alert.Source.IP in LookupHost("ddns.forust.xyz")
|
- evt.Overflow.Alert.Source.IP in LookupHost("ddns.forust.xyz")
|
||||||
|
|
||||||
|
# LAPI-only main config override, merged over config.yaml. NOTE: the
|
||||||
|
# chart's own default for this key is REPLACED, not merged, so its
|
||||||
|
# auto_registration block is repeated verbatim below - drop it and the
|
||||||
|
# agent can no longer register itself.
|
||||||
|
config.yaml.local: |
|
||||||
|
api:
|
||||||
|
server:
|
||||||
|
auto_registration: # Activate if not using TLS for authentication
|
||||||
|
enabled: true
|
||||||
|
token: "${REGISTRATION_TOKEN}" # /!\ Do not modify this variable (auto-generated and handled by the chart)
|
||||||
|
allowed_ranges: # /!\ Make sure to adapt to the pod IP ranges used by your cluster
|
||||||
|
- "127.0.0.1/32"
|
||||||
|
- "192.168.0.0/16"
|
||||||
|
- "10.0.0.0/8"
|
||||||
|
- "172.16.0.0/12"
|
||||||
|
# This homelab has no egress to console.crowdsec.cloud: DNS does
|
||||||
|
# not resolve. The LAPI kept trying anyway ("Signal push: N
|
||||||
|
# signals to push", "capi metrics: sending" every 10s) and each
|
||||||
|
# attempt sat on a resolver timeout WHILE HOLDING A WRITE
|
||||||
|
# TRANSACTION, which is what kept stalling per-request decision
|
||||||
|
# lookups even with WAL enabled. Nothing to share and nothing to
|
||||||
|
# pull - turn the Central API off instead of letting it block the
|
||||||
|
# only database writer we have.
|
||||||
|
online_client:
|
||||||
|
sharing: false
|
||||||
|
pull:
|
||||||
|
community: false
|
||||||
|
blocklists: false
|
||||||
|
disable_usage_metrics_export: true
|
||||||
|
db_config:
|
||||||
|
# SQLite without WAL serialises every reader behind the writer's
|
||||||
|
# rollback journal, and the LAPI writes constantly: the agent pushes
|
||||||
|
# Traefik alerts read from Loki, the metrics collector counts
|
||||||
|
# decisions, the bouncer touches "last pull" on every request.
|
||||||
|
# Symptom: decision lookups taking 10-30s (and a second connection
|
||||||
|
# that could not even open the database) while the LAPI sat at 28m
|
||||||
|
# CPU - the process was blocked in fsync, not computing. Every
|
||||||
|
# bouncer-protected request then blew through the plugin timeout and
|
||||||
|
# fail-closed with 403, on every site at once.
|
||||||
|
# The PVC is local-path-retain (hostPath), not a network share, so
|
||||||
|
# WAL is safe here; the crowdsec docs recommend it for exactly this
|
||||||
|
# ("allowing more concurrency in SQLite that will improve
|
||||||
|
# performances in most scenarios").
|
||||||
|
use_wal: true
|
||||||
|
# Keeps the alert table bounded. At the 5000/7d default the file
|
||||||
|
# reached 54MB in 15 days off the Traefik access log alone, and the
|
||||||
|
# metrics collector counts decisions on a timer; a smaller working
|
||||||
|
# set means fewer full scans. Crowdsec only prunes - SQLite never
|
||||||
|
# shrinks the file, so the size stays until a manual VACUUM.
|
||||||
|
flush:
|
||||||
|
max_items: 1000
|
||||||
|
max_age: 24h
|
||||||
|
|
||||||
lapi:
|
lapi:
|
||||||
env:
|
env:
|
||||||
- name: COLLECTIONS
|
- name: COLLECTIONS
|
||||||
@@ -90,13 +184,20 @@ lapi:
|
|||||||
enabled: true
|
enabled: true
|
||||||
size: 1Gi
|
size: 1Gi
|
||||||
storageClassName: local-path-retain
|
storageClassName: local-path-retain
|
||||||
|
# LAPI answers a blocking /v1/decisions lookup for EVERY bouncer-protected
|
||||||
|
# request (whole Traefik front door), so it is the hot path of the proxy.
|
||||||
|
# At 400m/500Mi it went CPU-throttled and idle lookups measured 1.3-7.4s,
|
||||||
|
# which pushed requests into the bouncer's fail-closed 403.
|
||||||
|
# Single replica on purpose: LAPI is stateful (BoltDB on the `data` PVC,
|
||||||
|
# credentials on the `config` PVC) - two replicas sharing those RWO
|
||||||
|
# volumes would corrupt the decision store. Scale up CPU, not replicas.
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 400m
|
cpu: 1500m
|
||||||
memory: 500Mi
|
memory: 1Gi
|
||||||
requests:
|
requests:
|
||||||
cpu: 50m
|
cpu: 250m
|
||||||
memory: 150Mi
|
memory: 500Mi
|
||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
storeLAPICscliCredentialsInSecret: true
|
storeLAPICscliCredentialsInSecret: true
|
||||||
@@ -32,6 +32,13 @@
|
|||||||
# on their own - same name + same password);
|
# on their own - same name + same password);
|
||||||
# 4. prune bouncer entries idle for 30d.
|
# 4. prune bouncer entries idle for 30d.
|
||||||
#
|
#
|
||||||
|
# It used to also delete LePresidente/http-generic-403-bf decisions hourly.
|
||||||
|
# That was a workaround for the bouncer failing closed on a slow LAPI and
|
||||||
|
# 403-ing the deploy runner into a 4h ban. The bouncer now polls decisions
|
||||||
|
# into a cache and never blocks on an unreachable LAPI, so it cannot
|
||||||
|
# manufacture those 403s any more, and the scenario only fires against real
|
||||||
|
# scanners - deleting their decisions hourly was undoing a working ban.
|
||||||
|
#
|
||||||
# Manual apply (crowdsec/k8s is NOT managed by deploy.yaml):
|
# Manual apply (crowdsec/k8s is NOT managed by deploy.yaml):
|
||||||
# kubectl apply -f crowdsec/k8s/janitor-cronjob.yaml
|
# kubectl apply -f crowdsec/k8s/janitor-cronjob.yaml
|
||||||
# Force a run:
|
# Force a run:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
dockmon:
|
dockmon:
|
||||||
image: darthnorse/dockmon:2.4.5
|
image: darthnorse/dockmon:2.5.0
|
||||||
container_name: dockmon
|
container_name: dockmon
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
# ports:
|
# ports:
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: dockmon-prod-tls
|
||||||
|
namespace: dockmon
|
||||||
|
spec:
|
||||||
|
secretName: dockmon-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- dockmon.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: dockmon
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -29,7 +29,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: dockmon
|
- name: dockmon
|
||||||
image: darthnorse/dockmon:2.4.5
|
image: darthnorse/dockmon:2.5.0
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 443
|
- containerPort: 443
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
|||||||
@@ -18,15 +18,13 @@ spec:
|
|||||||
- match: Host(`dockmon.forust.xyz`)
|
- match: Host(`dockmon.forust.xyz`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
middlewares:
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
- name: security-headers@file
|
- name: security-headers@file
|
||||||
services:
|
services:
|
||||||
- name: dockmon-service
|
- name: dockmon-service
|
||||||
port: 443
|
port: 443
|
||||||
serversTransport: dockmon-transport
|
serversTransport: dockmon-transport
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: dockmon-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -43,3 +41,5 @@ spec:
|
|||||||
- name: dockmon-service
|
- name: dockmon-service
|
||||||
port: 443
|
port: 443
|
||||||
serversTransport: dockmon-transport
|
serversTransport: dockmon-transport
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
downtify:
|
downtify:
|
||||||
container_name: downtify
|
container_name: downtify
|
||||||
image: ghcr.io/henriquesebastiao/downtify:2.13.0
|
image: ghcr.io/henriquesebastiao/downtify:3.4.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
# ports:
|
# ports:
|
||||||
# - '7077:8000'
|
# - '7077:8000'
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: downtify
|
app: downtify
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -27,7 +29,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: downtify
|
- name: downtify
|
||||||
image: ghcr.io/henriquesebastiao/downtify:2.13.0
|
image: ghcr.io/henriquesebastiao/downtify:3.4.0
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8000
|
- containerPort: 8000
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
|||||||
@@ -10,14 +10,12 @@ spec:
|
|||||||
- match: Host(`downtify.forust.xyz`)
|
- match: Host(`downtify.forust.xyz`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
middlewares:
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
- name: security-chain@file
|
- name: security-chain@file
|
||||||
services:
|
services:
|
||||||
- name: downtify-service
|
- name: downtify-service
|
||||||
port: 8000
|
port: 8000
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: downtify-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -33,3 +31,5 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: downtify-service
|
- name: downtify-service
|
||||||
port: 8000
|
port: 8000
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
FROM python:3.9-alpine
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Установка зависимостей
|
|
||||||
COPY requirements.txt .
|
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
|
||||||
|
|
||||||
# Копирование кода
|
|
||||||
COPY main.py .
|
|
||||||
COPY .env .
|
|
||||||
# Запуск бота
|
|
||||||
CMD ["python", "-u", "main.py"]
|
|
||||||
@@ -1,373 +0,0 @@
|
|||||||
Mozilla Public License Version 2.0
|
|
||||||
==================================
|
|
||||||
|
|
||||||
1. Definitions
|
|
||||||
--------------
|
|
||||||
|
|
||||||
1.1. "Contributor"
|
|
||||||
means each individual or legal entity that creates, contributes to
|
|
||||||
the creation of, or owns Covered Software.
|
|
||||||
|
|
||||||
1.2. "Contributor Version"
|
|
||||||
means the combination of the Contributions of others (if any) used
|
|
||||||
by a Contributor and that particular Contributor's Contribution.
|
|
||||||
|
|
||||||
1.3. "Contribution"
|
|
||||||
means Covered Software of a particular Contributor.
|
|
||||||
|
|
||||||
1.4. "Covered Software"
|
|
||||||
means Source Code Form to which the initial Contributor has attached
|
|
||||||
the notice in Exhibit A, the Executable Form of such Source Code
|
|
||||||
Form, and Modifications of such Source Code Form, in each case
|
|
||||||
including portions thereof.
|
|
||||||
|
|
||||||
1.5. "Incompatible With Secondary Licenses"
|
|
||||||
means
|
|
||||||
|
|
||||||
(a) that the initial Contributor has attached the notice described
|
|
||||||
in Exhibit B to the Covered Software; or
|
|
||||||
|
|
||||||
(b) that the Covered Software was made available under the terms of
|
|
||||||
version 1.1 or earlier of the License, but not also under the
|
|
||||||
terms of a Secondary License.
|
|
||||||
|
|
||||||
1.6. "Executable Form"
|
|
||||||
means any form of the work other than Source Code Form.
|
|
||||||
|
|
||||||
1.7. "Larger Work"
|
|
||||||
means a work that combines Covered Software with other material, in
|
|
||||||
a separate file or files, that is not Covered Software.
|
|
||||||
|
|
||||||
1.8. "License"
|
|
||||||
means this document.
|
|
||||||
|
|
||||||
1.9. "Licensable"
|
|
||||||
means having the right to grant, to the maximum extent possible,
|
|
||||||
whether at the time of the initial grant or subsequently, any and
|
|
||||||
all of the rights conveyed by this License.
|
|
||||||
|
|
||||||
1.10. "Modifications"
|
|
||||||
means any of the following:
|
|
||||||
|
|
||||||
(a) any file in Source Code Form that results from an addition to,
|
|
||||||
deletion from, or modification of the contents of Covered
|
|
||||||
Software; or
|
|
||||||
|
|
||||||
(b) any new file in Source Code Form that contains any Covered
|
|
||||||
Software.
|
|
||||||
|
|
||||||
1.11. "Patent Claims" of a Contributor
|
|
||||||
means any patent claim(s), including without limitation, method,
|
|
||||||
process, and apparatus claims, in any patent Licensable by such
|
|
||||||
Contributor that would be infringed, but for the grant of the
|
|
||||||
License, by the making, using, selling, offering for sale, having
|
|
||||||
made, import, or transfer of either its Contributions or its
|
|
||||||
Contributor Version.
|
|
||||||
|
|
||||||
1.12. "Secondary License"
|
|
||||||
means either the GNU General Public License, Version 2.0, the GNU
|
|
||||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
|
||||||
Public License, Version 3.0, or any later versions of those
|
|
||||||
licenses.
|
|
||||||
|
|
||||||
1.13. "Source Code Form"
|
|
||||||
means the form of the work preferred for making modifications.
|
|
||||||
|
|
||||||
1.14. "You" (or "Your")
|
|
||||||
means an individual or a legal entity exercising rights under this
|
|
||||||
License. For legal entities, "You" includes any entity that
|
|
||||||
controls, is controlled by, or is under common control with You. For
|
|
||||||
purposes of this definition, "control" means (a) the power, direct
|
|
||||||
or indirect, to cause the direction or management of such entity,
|
|
||||||
whether by contract or otherwise, or (b) ownership of more than
|
|
||||||
fifty percent (50%) of the outstanding shares or beneficial
|
|
||||||
ownership of such entity.
|
|
||||||
|
|
||||||
2. License Grants and Conditions
|
|
||||||
--------------------------------
|
|
||||||
|
|
||||||
2.1. Grants
|
|
||||||
|
|
||||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
|
||||||
non-exclusive license:
|
|
||||||
|
|
||||||
(a) under intellectual property rights (other than patent or trademark)
|
|
||||||
Licensable by such Contributor to use, reproduce, make available,
|
|
||||||
modify, display, perform, distribute, and otherwise exploit its
|
|
||||||
Contributions, either on an unmodified basis, with Modifications, or
|
|
||||||
as part of a Larger Work; and
|
|
||||||
|
|
||||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
|
||||||
for sale, have made, import, and otherwise transfer either its
|
|
||||||
Contributions or its Contributor Version.
|
|
||||||
|
|
||||||
2.2. Effective Date
|
|
||||||
|
|
||||||
The licenses granted in Section 2.1 with respect to any Contribution
|
|
||||||
become effective for each Contribution on the date the Contributor first
|
|
||||||
distributes such Contribution.
|
|
||||||
|
|
||||||
2.3. Limitations on Grant Scope
|
|
||||||
|
|
||||||
The licenses granted in this Section 2 are the only rights granted under
|
|
||||||
this License. No additional rights or licenses will be implied from the
|
|
||||||
distribution or licensing of Covered Software under this License.
|
|
||||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
|
||||||
Contributor:
|
|
||||||
|
|
||||||
(a) for any code that a Contributor has removed from Covered Software;
|
|
||||||
or
|
|
||||||
|
|
||||||
(b) for infringements caused by: (i) Your and any other third party's
|
|
||||||
modifications of Covered Software, or (ii) the combination of its
|
|
||||||
Contributions with other software (except as part of its Contributor
|
|
||||||
Version); or
|
|
||||||
|
|
||||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
|
||||||
its Contributions.
|
|
||||||
|
|
||||||
This License does not grant any rights in the trademarks, service marks,
|
|
||||||
or logos of any Contributor (except as may be necessary to comply with
|
|
||||||
the notice requirements in Section 3.4).
|
|
||||||
|
|
||||||
2.4. Subsequent Licenses
|
|
||||||
|
|
||||||
No Contributor makes additional grants as a result of Your choice to
|
|
||||||
distribute the Covered Software under a subsequent version of this
|
|
||||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
|
||||||
permitted under the terms of Section 3.3).
|
|
||||||
|
|
||||||
2.5. Representation
|
|
||||||
|
|
||||||
Each Contributor represents that the Contributor believes its
|
|
||||||
Contributions are its original creation(s) or it has sufficient rights
|
|
||||||
to grant the rights to its Contributions conveyed by this License.
|
|
||||||
|
|
||||||
2.6. Fair Use
|
|
||||||
|
|
||||||
This License is not intended to limit any rights You have under
|
|
||||||
applicable copyright doctrines of fair use, fair dealing, or other
|
|
||||||
equivalents.
|
|
||||||
|
|
||||||
2.7. Conditions
|
|
||||||
|
|
||||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
|
||||||
in Section 2.1.
|
|
||||||
|
|
||||||
3. Responsibilities
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
3.1. Distribution of Source Form
|
|
||||||
|
|
||||||
All distribution of Covered Software in Source Code Form, including any
|
|
||||||
Modifications that You create or to which You contribute, must be under
|
|
||||||
the terms of this License. You must inform recipients that the Source
|
|
||||||
Code Form of the Covered Software is governed by the terms of this
|
|
||||||
License, and how they can obtain a copy of this License. You may not
|
|
||||||
attempt to alter or restrict the recipients' rights in the Source Code
|
|
||||||
Form.
|
|
||||||
|
|
||||||
3.2. Distribution of Executable Form
|
|
||||||
|
|
||||||
If You distribute Covered Software in Executable Form then:
|
|
||||||
|
|
||||||
(a) such Covered Software must also be made available in Source Code
|
|
||||||
Form, as described in Section 3.1, and You must inform recipients of
|
|
||||||
the Executable Form how they can obtain a copy of such Source Code
|
|
||||||
Form by reasonable means in a timely manner, at a charge no more
|
|
||||||
than the cost of distribution to the recipient; and
|
|
||||||
|
|
||||||
(b) You may distribute such Executable Form under the terms of this
|
|
||||||
License, or sublicense it under different terms, provided that the
|
|
||||||
license for the Executable Form does not attempt to limit or alter
|
|
||||||
the recipients' rights in the Source Code Form under this License.
|
|
||||||
|
|
||||||
3.3. Distribution of a Larger Work
|
|
||||||
|
|
||||||
You may create and distribute a Larger Work under terms of Your choice,
|
|
||||||
provided that You also comply with the requirements of this License for
|
|
||||||
the Covered Software. If the Larger Work is a combination of Covered
|
|
||||||
Software with a work governed by one or more Secondary Licenses, and the
|
|
||||||
Covered Software is not Incompatible With Secondary Licenses, this
|
|
||||||
License permits You to additionally distribute such Covered Software
|
|
||||||
under the terms of such Secondary License(s), so that the recipient of
|
|
||||||
the Larger Work may, at their option, further distribute the Covered
|
|
||||||
Software under the terms of either this License or such Secondary
|
|
||||||
License(s).
|
|
||||||
|
|
||||||
3.4. Notices
|
|
||||||
|
|
||||||
You may not remove or alter the substance of any license notices
|
|
||||||
(including copyright notices, patent notices, disclaimers of warranty,
|
|
||||||
or limitations of liability) contained within the Source Code Form of
|
|
||||||
the Covered Software, except that You may alter any license notices to
|
|
||||||
the extent required to remedy known factual inaccuracies.
|
|
||||||
|
|
||||||
3.5. Application of Additional Terms
|
|
||||||
|
|
||||||
You may choose to offer, and to charge a fee for, warranty, support,
|
|
||||||
indemnity or liability obligations to one or more recipients of Covered
|
|
||||||
Software. However, You may do so only on Your own behalf, and not on
|
|
||||||
behalf of any Contributor. You must make it absolutely clear that any
|
|
||||||
such warranty, support, indemnity, or liability obligation is offered by
|
|
||||||
You alone, and You hereby agree to indemnify every Contributor for any
|
|
||||||
liability incurred by such Contributor as a result of warranty, support,
|
|
||||||
indemnity or liability terms You offer. You may include additional
|
|
||||||
disclaimers of warranty and limitations of liability specific to any
|
|
||||||
jurisdiction.
|
|
||||||
|
|
||||||
4. Inability to Comply Due to Statute or Regulation
|
|
||||||
---------------------------------------------------
|
|
||||||
|
|
||||||
If it is impossible for You to comply with any of the terms of this
|
|
||||||
License with respect to some or all of the Covered Software due to
|
|
||||||
statute, judicial order, or regulation then You must: (a) comply with
|
|
||||||
the terms of this License to the maximum extent possible; and (b)
|
|
||||||
describe the limitations and the code they affect. Such description must
|
|
||||||
be placed in a text file included with all distributions of the Covered
|
|
||||||
Software under this License. Except to the extent prohibited by statute
|
|
||||||
or regulation, such description must be sufficiently detailed for a
|
|
||||||
recipient of ordinary skill to be able to understand it.
|
|
||||||
|
|
||||||
5. Termination
|
|
||||||
--------------
|
|
||||||
|
|
||||||
5.1. The rights granted under this License will terminate automatically
|
|
||||||
if You fail to comply with any of its terms. However, if You become
|
|
||||||
compliant, then the rights granted under this License from a particular
|
|
||||||
Contributor are reinstated (a) provisionally, unless and until such
|
|
||||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
|
||||||
ongoing basis, if such Contributor fails to notify You of the
|
|
||||||
non-compliance by some reasonable means prior to 60 days after You have
|
|
||||||
come back into compliance. Moreover, Your grants from a particular
|
|
||||||
Contributor are reinstated on an ongoing basis if such Contributor
|
|
||||||
notifies You of the non-compliance by some reasonable means, this is the
|
|
||||||
first time You have received notice of non-compliance with this License
|
|
||||||
from such Contributor, and You become compliant prior to 30 days after
|
|
||||||
Your receipt of the notice.
|
|
||||||
|
|
||||||
5.2. If You initiate litigation against any entity by asserting a patent
|
|
||||||
infringement claim (excluding declaratory judgment actions,
|
|
||||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
|
||||||
directly or indirectly infringes any patent, then the rights granted to
|
|
||||||
You by any and all Contributors for the Covered Software under Section
|
|
||||||
2.1 of this License shall terminate.
|
|
||||||
|
|
||||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
|
||||||
end user license agreements (excluding distributors and resellers) which
|
|
||||||
have been validly granted by You or Your distributors under this License
|
|
||||||
prior to termination shall survive termination.
|
|
||||||
|
|
||||||
************************************************************************
|
|
||||||
* *
|
|
||||||
* 6. Disclaimer of Warranty *
|
|
||||||
* ------------------------- *
|
|
||||||
* *
|
|
||||||
* Covered Software is provided under this License on an "as is" *
|
|
||||||
* basis, without warranty of any kind, either expressed, implied, or *
|
|
||||||
* statutory, including, without limitation, warranties that the *
|
|
||||||
* Covered Software is free of defects, merchantable, fit for a *
|
|
||||||
* particular purpose or non-infringing. The entire risk as to the *
|
|
||||||
* quality and performance of the Covered Software is with You. *
|
|
||||||
* Should any Covered Software prove defective in any respect, You *
|
|
||||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
|
||||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
|
||||||
* essential part of this License. No use of any Covered Software is *
|
|
||||||
* authorized under this License except under this disclaimer. *
|
|
||||||
* *
|
|
||||||
************************************************************************
|
|
||||||
|
|
||||||
************************************************************************
|
|
||||||
* *
|
|
||||||
* 7. Limitation of Liability *
|
|
||||||
* -------------------------- *
|
|
||||||
* *
|
|
||||||
* Under no circumstances and under no legal theory, whether tort *
|
|
||||||
* (including negligence), contract, or otherwise, shall any *
|
|
||||||
* Contributor, or anyone who distributes Covered Software as *
|
|
||||||
* permitted above, be liable to You for any direct, indirect, *
|
|
||||||
* special, incidental, or consequential damages of any character *
|
|
||||||
* including, without limitation, damages for lost profits, loss of *
|
|
||||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
|
||||||
* and all other commercial damages or losses, even if such party *
|
|
||||||
* shall have been informed of the possibility of such damages. This *
|
|
||||||
* limitation of liability shall not apply to liability for death or *
|
|
||||||
* personal injury resulting from such party's negligence to the *
|
|
||||||
* extent applicable law prohibits such limitation. Some *
|
|
||||||
* jurisdictions do not allow the exclusion or limitation of *
|
|
||||||
* incidental or consequential damages, so this exclusion and *
|
|
||||||
* limitation may not apply to You. *
|
|
||||||
* *
|
|
||||||
************************************************************************
|
|
||||||
|
|
||||||
8. Litigation
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Any litigation relating to this License may be brought only in the
|
|
||||||
courts of a jurisdiction where the defendant maintains its principal
|
|
||||||
place of business and such litigation shall be governed by laws of that
|
|
||||||
jurisdiction, without reference to its conflict-of-law provisions.
|
|
||||||
Nothing in this Section shall prevent a party's ability to bring
|
|
||||||
cross-claims or counter-claims.
|
|
||||||
|
|
||||||
9. Miscellaneous
|
|
||||||
----------------
|
|
||||||
|
|
||||||
This License represents the complete agreement concerning the subject
|
|
||||||
matter hereof. If any provision of this License is held to be
|
|
||||||
unenforceable, such provision shall be reformed only to the extent
|
|
||||||
necessary to make it enforceable. Any law or regulation which provides
|
|
||||||
that the language of a contract shall be construed against the drafter
|
|
||||||
shall not be used to construe this License against a Contributor.
|
|
||||||
|
|
||||||
10. Versions of the License
|
|
||||||
---------------------------
|
|
||||||
|
|
||||||
10.1. New Versions
|
|
||||||
|
|
||||||
Mozilla Foundation is the license steward. Except as provided in Section
|
|
||||||
10.3, no one other than the license steward has the right to modify or
|
|
||||||
publish new versions of this License. Each version will be given a
|
|
||||||
distinguishing version number.
|
|
||||||
|
|
||||||
10.2. Effect of New Versions
|
|
||||||
|
|
||||||
You may distribute the Covered Software under the terms of the version
|
|
||||||
of the License under which You originally received the Covered Software,
|
|
||||||
or under the terms of any subsequent version published by the license
|
|
||||||
steward.
|
|
||||||
|
|
||||||
10.3. Modified Versions
|
|
||||||
|
|
||||||
If you create software not governed by this License, and you want to
|
|
||||||
create a new license for such software, you may create and use a
|
|
||||||
modified version of this License if you rename the license and remove
|
|
||||||
any references to the name of the license steward (except to note that
|
|
||||||
such modified license differs from this License).
|
|
||||||
|
|
||||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
|
||||||
Licenses
|
|
||||||
|
|
||||||
If You choose to distribute Source Code Form that is Incompatible With
|
|
||||||
Secondary Licenses under the terms of this version of the License, the
|
|
||||||
notice described in Exhibit B of this License must be attached.
|
|
||||||
|
|
||||||
Exhibit A - Source Code Form License Notice
|
|
||||||
-------------------------------------------
|
|
||||||
|
|
||||||
This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
If it is not possible or desirable to put the notice in a particular
|
|
||||||
file, then You may include the notice in a location (such as a LICENSE
|
|
||||||
file in a relevant directory) where a recipient would be likely to look
|
|
||||||
for such a notice.
|
|
||||||
|
|
||||||
You may add additional accurate notices of copyright ownership.
|
|
||||||
|
|
||||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
|
||||||
---------------------------------------------------------
|
|
||||||
|
|
||||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
|
||||||
defined by the Mozilla Public License, v. 2.0.
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
services:
|
|
||||||
dtek_notif:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
image: gcr.forust.xyz/forust/dtek-notif:latest
|
|
||||||
pull_policy: build
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
- TZ=Europe/Kyiv
|
|
||||||
dns:
|
|
||||||
- 1.1.1.1
|
|
||||||
- 8.8.8.8
|
|
||||||
networks:
|
|
||||||
- default
|
|
||||||
@@ -1,748 +0,0 @@
|
|||||||
import asyncio
|
|
||||||
import contextlib
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
|
|
||||||
import requests
|
|
||||||
from aiogram import Bot, Dispatcher
|
|
||||||
from aiogram.filters import Command
|
|
||||||
from aiogram.types import KeyboardButton, Message
|
|
||||||
from aiogram.utils.keyboard import ReplyKeyboardBuilder
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
|
|
||||||
# Загрузка переменных окружения
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
# Настройки
|
|
||||||
TELEGRAM_TOKEN = os.getenv('TELEGRAM_TOKEN', 'YOUR_TOKEN_HERE')
|
|
||||||
ALLOWED_CHAT_IDS = list(map(int, os.getenv('ALLOWED_CHAT_IDS', '').split(','))) if os.getenv('ALLOWED_CHAT_IDS') else []
|
|
||||||
CHECK_INTERVAL = int(os.getenv('CHECK_INTERVAL', '120'))
|
|
||||||
|
|
||||||
# Параметры для запроса
|
|
||||||
VOE_CITY_ID = int(os.getenv('VOE_CITY_ID', 'VOE_CITY_ID'))
|
|
||||||
VOE_STREET_ID = int(os.getenv('VOE_STREET_ID', 'VOE_STREET_ID'))
|
|
||||||
VOE_HOUSE_ID = int(os.getenv('VOE_HOUSE_ID', 'VOE_HOUSE_ID'))
|
|
||||||
|
|
||||||
# Настройка логирования
|
|
||||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
# Глобальные переменные
|
|
||||||
bot = Bot(token=TELEGRAM_TOKEN)
|
|
||||||
dp = Dispatcher()
|
|
||||||
last_schedule: list[dict] | None = None
|
|
||||||
last_notification_time: dict[str, datetime] = {}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# УТИЛИТЫ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
def format_time_duration(minutes: int) -> str:
|
|
||||||
"""Форматирует время из минут в часы и минуты"""
|
|
||||||
hours = minutes // 60
|
|
||||||
mins = minutes % 60
|
|
||||||
|
|
||||||
if hours == 0:
|
|
||||||
return f'{mins}м'
|
|
||||||
elif mins == 0:
|
|
||||||
return f'{hours}ч'
|
|
||||||
return f'{hours}ч {mins}м'
|
|
||||||
|
|
||||||
|
|
||||||
def get_day_statistics(day_blocks: list[dict]) -> dict[str, int]:
|
|
||||||
"""Получает статистику по дню"""
|
|
||||||
total_minutes = 0
|
|
||||||
confirmed_minutes = 0
|
|
||||||
possible_minutes = 0
|
|
||||||
|
|
||||||
for block in day_blocks:
|
|
||||||
for half in [block['first_half'], block['second_half']]:
|
|
||||||
if half['status'] == 'off':
|
|
||||||
total_minutes += 30
|
|
||||||
if half['confirmed']:
|
|
||||||
confirmed_minutes += 30
|
|
||||||
else:
|
|
||||||
possible_minutes += 30
|
|
||||||
|
|
||||||
return {'total': total_minutes, 'confirmed': confirmed_minutes, 'possible': possible_minutes}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ПАРСИНГ ДАННЫХ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
def parse_html(html: str) -> list[dict]:
|
|
||||||
"""Парсит HTML с графиком отключений (логика от 15.11.2024)"""
|
|
||||||
soup = BeautifulSoup(html, 'html.parser')
|
|
||||||
cells = soup.select('.disconnection-detailed-table-cell.cell')
|
|
||||||
|
|
||||||
schedule = []
|
|
||||||
current_hour = 0
|
|
||||||
current_day = 0
|
|
||||||
|
|
||||||
for cell in cells:
|
|
||||||
if 'legend' in cell.get('class', []) or 'head' in cell.get('class', []):
|
|
||||||
continue
|
|
||||||
|
|
||||||
cell_classes = cell.get('class', [])
|
|
||||||
|
|
||||||
# ПРоверка статуса отключения на весь час
|
|
||||||
full_hour_off = 'has_disconnection' in cell_classes and 'full_hour' in cell_classes
|
|
||||||
|
|
||||||
hour_block = cell.select_one('.hour_block')
|
|
||||||
if not hour_block:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Проверка подтверждённости отключения для всего часа
|
|
||||||
cell_confirmed = None
|
|
||||||
if 'confirm_1' in cell_classes:
|
|
||||||
cell_confirmed = True
|
|
||||||
elif 'confirm_0' in cell_classes:
|
|
||||||
cell_confirmed = False
|
|
||||||
|
|
||||||
# Проверка половин часа
|
|
||||||
left = hour_block.select_one('.half.left')
|
|
||||||
right = hour_block.select_one('.half.right')
|
|
||||||
|
|
||||||
def parse_half(half, is_full_hour_off: bool, cell_confirmed: bool | None = None) -> dict:
|
|
||||||
"""Парсит половину часа"""
|
|
||||||
if not half:
|
|
||||||
return {'status': 'on', 'queue': None, 'confirmed': None}
|
|
||||||
|
|
||||||
half_classes = half.get('class', [])
|
|
||||||
|
|
||||||
# Если вся ячейка full_hour - используем статус ячейки
|
|
||||||
if is_full_hour_off:
|
|
||||||
return {'status': 'off', 'queue': None, 'confirmed': cell_confirmed}
|
|
||||||
|
|
||||||
# Определяем статус половины
|
|
||||||
if 'has_disconnection' in half_classes:
|
|
||||||
status = 'off'
|
|
||||||
elif 'no_disconnection' in half_classes:
|
|
||||||
status = 'on'
|
|
||||||
else:
|
|
||||||
status = 'on' # По умолчанию считаем включенным
|
|
||||||
|
|
||||||
# Если выключено - ищем подробности
|
|
||||||
queue = None
|
|
||||||
confirmed = None
|
|
||||||
|
|
||||||
if status == 'off':
|
|
||||||
disconnection_div = half.select_one('.disconnection')
|
|
||||||
if disconnection_div:
|
|
||||||
# Ищем номер черги в title
|
|
||||||
if disconnection_div.has_attr('title'):
|
|
||||||
title = disconnection_div['title']
|
|
||||||
if 'Номер черги' in title or 'Номер черги:' in title:
|
|
||||||
with contextlib.suppress(BaseException):
|
|
||||||
queue = title.split(':')[-1].strip()
|
|
||||||
|
|
||||||
# Определяем подтверждение
|
|
||||||
disc_classes = disconnection_div.get('class', [])
|
|
||||||
if 'disconnection_confirm_1' in disc_classes:
|
|
||||||
confirmed = True
|
|
||||||
elif 'disconnection_confirm_0' in disc_classes:
|
|
||||||
confirmed = False
|
|
||||||
|
|
||||||
return {'status': status, 'queue': queue, 'confirmed': confirmed}
|
|
||||||
|
|
||||||
first_half_data = parse_half(left, full_hour_off, cell_confirmed)
|
|
||||||
second_half_data = parse_half(right, full_hour_off, cell_confirmed)
|
|
||||||
|
|
||||||
schedule.append(
|
|
||||||
{
|
|
||||||
'hour': current_hour,
|
|
||||||
'day': current_day,
|
|
||||||
'first_half': first_half_data,
|
|
||||||
'second_half': second_half_data,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
current_hour += 1
|
|
||||||
if current_hour >= 24:
|
|
||||||
current_hour = 0
|
|
||||||
current_day += 1
|
|
||||||
|
|
||||||
return schedule
|
|
||||||
|
|
||||||
|
|
||||||
def get_voe_html(city_id: int, street_id: int, house_id: int) -> str:
|
|
||||||
"""Получает HTML с сайта VOE"""
|
|
||||||
url = 'https://www.voe.com.ua/disconnection/detailed?ajax_form=1&_wrapper_format=drupal_ajax'
|
|
||||||
headers = {
|
|
||||||
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
|
|
||||||
'X-Requested-With': 'XMLHttpRequest',
|
|
||||||
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
|
|
||||||
}
|
|
||||||
data = {
|
|
||||||
'search_type': 0,
|
|
||||||
'city_id': city_id,
|
|
||||||
'street_id': street_id,
|
|
||||||
'house_id': house_id,
|
|
||||||
'form_build_id': 'form-Irv5aHw1R2FT_Ik2apyHOZ47hTH5xPNH_LQnBrmpSTc',
|
|
||||||
'form_id': 'disconnection_detailed_search_form',
|
|
||||||
'_triggering_element_name': 'search',
|
|
||||||
'_triggering_element_value': 'Показати',
|
|
||||||
'_drupal_ajax': 1,
|
|
||||||
}
|
|
||||||
|
|
||||||
try:
|
|
||||||
response = requests.post(url, headers=headers, data=data, timeout=10)
|
|
||||||
response.raise_for_status()
|
|
||||||
resp_json = response.json()
|
|
||||||
|
|
||||||
insert_html = next((item['data'] for item in resp_json if item.get('command') == 'insert'), None)
|
|
||||||
|
|
||||||
if not insert_html:
|
|
||||||
raise ValueError('HTML не найден в ответе')
|
|
||||||
|
|
||||||
return insert_html
|
|
||||||
except requests.exceptions.RequestException as e:
|
|
||||||
logger.error(f'Ошибка запроса VOE: {e}')
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ФОРМАТИРОВАНИЕ СООБЩЕНИЙ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
def get_main_keyboard():
|
|
||||||
"""Создает главную клавиатуру"""
|
|
||||||
builder = ReplyKeyboardBuilder()
|
|
||||||
builder.row(KeyboardButton(text='📊 Графік'), KeyboardButton(text='🔄 Оновити'))
|
|
||||||
builder.row(KeyboardButton(text='📅 Сьогодні'), KeyboardButton(text='📅 Завтра'))
|
|
||||||
builder.row(KeyboardButton(text='ℹ️ Про бота'))
|
|
||||||
return builder.as_markup(resize_keyboard=True)
|
|
||||||
|
|
||||||
|
|
||||||
def format_schedule_message(schedule: list[dict], days_to_show: int = 2) -> str:
|
|
||||||
"""Форматирует полный график на несколько дней"""
|
|
||||||
lines = [
|
|
||||||
'⚡️ <b>Графік відключень світла</b>',
|
|
||||||
f'🕐 Оновлено: {datetime.now().strftime("%d.%m.%Y %H:%M:%S")}',
|
|
||||||
'─' * 30,
|
|
||||||
'',
|
|
||||||
]
|
|
||||||
|
|
||||||
start_date = datetime.now()
|
|
||||||
|
|
||||||
for day in range(min(days_to_show, 2)):
|
|
||||||
day_blocks = [b for b in schedule if b['day'] == day]
|
|
||||||
if not day_blocks:
|
|
||||||
continue
|
|
||||||
|
|
||||||
date_str = (start_date + timedelta(days=day)).strftime('%d.%m.%Y')
|
|
||||||
day_name = '🌅 <b>Сьогодні</b>' if day == 0 else '🌄 <b>Завтра</b>'
|
|
||||||
|
|
||||||
lines.append(f'{day_name} ({date_str})')
|
|
||||||
|
|
||||||
# Статистика
|
|
||||||
stats = get_day_statistics(day_blocks)
|
|
||||||
if stats['total'] > 0:
|
|
||||||
lines.append(f'⏱ Всього: <code>{format_time_duration(stats["total"])}</code>')
|
|
||||||
if stats['confirmed'] > 0:
|
|
||||||
lines.append(f'🔴 Підтверджено: <code>{format_time_duration(stats["confirmed"])}</code>')
|
|
||||||
if stats['possible'] > 0:
|
|
||||||
lines.append(f'🟠 Можливо: <code>{format_time_duration(stats["possible"])}</code>')
|
|
||||||
else:
|
|
||||||
lines.append('🟢 <b>Відключень немає!</b>')
|
|
||||||
|
|
||||||
lines.append('')
|
|
||||||
|
|
||||||
# Детальный список отключений
|
|
||||||
disconnections = []
|
|
||||||
current_status = None
|
|
||||||
start_time = None
|
|
||||||
current_confirmed = None
|
|
||||||
current_queue = None
|
|
||||||
|
|
||||||
for block in day_blocks:
|
|
||||||
hour = block['hour']
|
|
||||||
|
|
||||||
for half_idx, half in enumerate([block['first_half'], block['second_half']]):
|
|
||||||
time_str = f'{hour:02d}:00' if half_idx == 0 else f'{hour:02d}:30'
|
|
||||||
|
|
||||||
if half['status'] == 'off':
|
|
||||||
if current_status != 'off':
|
|
||||||
start_time = time_str
|
|
||||||
current_confirmed = half['confirmed']
|
|
||||||
current_queue = half['queue']
|
|
||||||
current_status = 'off'
|
|
||||||
else:
|
|
||||||
if current_status == 'off':
|
|
||||||
icon = '🔴' if current_confirmed else '🟠'
|
|
||||||
queue_text = f' (Ч{current_queue})' if current_queue else ''
|
|
||||||
disconnections.append(f'{icon} <code>{start_time} - {time_str}</code>{queue_text}')
|
|
||||||
current_status = half['status']
|
|
||||||
|
|
||||||
# Если день закончился на отключении
|
|
||||||
if current_status == 'off':
|
|
||||||
icon = '🔴' if current_confirmed else '🟠'
|
|
||||||
queue_text = f' (Ч{current_queue})' if current_queue else ''
|
|
||||||
next_hour = (day_blocks[-1]['hour'] + 1) % 24
|
|
||||||
end_time = f'{next_hour:02d}:00'
|
|
||||||
disconnections.append(f'{icon} <code>{start_time} - {end_time}</code>{queue_text}')
|
|
||||||
|
|
||||||
if disconnections:
|
|
||||||
for idx, disc in enumerate(disconnections, 1):
|
|
||||||
lines.append(f'{idx}. {disc}')
|
|
||||||
|
|
||||||
lines.append('')
|
|
||||||
|
|
||||||
lines.append('<i>🔴 = підтверджено • 🟠 = можливо • 🟢 = світло</i>')
|
|
||||||
|
|
||||||
return '\n'.join(lines)
|
|
||||||
|
|
||||||
|
|
||||||
def format_single_day_schedule(schedule: list[dict], day: int) -> str:
|
|
||||||
"""Форматирует график на один день"""
|
|
||||||
day_blocks = [b for b in schedule if b['day'] == day]
|
|
||||||
if not day_blocks:
|
|
||||||
return '❌ Немає даних для цього дня'
|
|
||||||
|
|
||||||
start_date = datetime.now()
|
|
||||||
date_str = (start_date + timedelta(days=day)).strftime('%d.%m.%Y')
|
|
||||||
day_name = '🟠 <b>Сьогодні</b>' if day == 0 else '🔶 <b>Завтра</b>'
|
|
||||||
|
|
||||||
lines = [f'{day_name} • {date_str}', '']
|
|
||||||
|
|
||||||
# Статистика
|
|
||||||
lines.append('<b>📊 Статистика</b>')
|
|
||||||
stats = get_day_statistics(day_blocks)
|
|
||||||
|
|
||||||
if stats['total'] == 0:
|
|
||||||
lines.append('└ 🟢 <b>Відключень немає!</b>')
|
|
||||||
else:
|
|
||||||
total_time = format_time_duration(stats['total'])
|
|
||||||
lines.append(f'├ ⏱ Всього: <code>{total_time}</code>')
|
|
||||||
|
|
||||||
if stats['confirmed'] > 0:
|
|
||||||
confirmed_time = format_time_duration(stats['confirmed'])
|
|
||||||
lines.append(f'├ 🔴 Підтверджено: <code>{confirmed_time}</code>')
|
|
||||||
|
|
||||||
if stats['possible'] > 0:
|
|
||||||
possible_time = format_time_duration(stats['possible'])
|
|
||||||
lines.append(f'└ 🟠 Можливо: <code>{possible_time}</code>')
|
|
||||||
else:
|
|
||||||
lines.append('└ 🟢 Решта часу світло')
|
|
||||||
|
|
||||||
lines.append('')
|
|
||||||
|
|
||||||
# Детальный список отключений
|
|
||||||
disconnections = []
|
|
||||||
current_status = None
|
|
||||||
start_time = None
|
|
||||||
current_confirmed = None
|
|
||||||
current_queue = None
|
|
||||||
|
|
||||||
for block in day_blocks:
|
|
||||||
hour = block['hour']
|
|
||||||
|
|
||||||
for half_idx, half in enumerate([block['first_half'], block['second_half']]):
|
|
||||||
time_str = f'{hour:02d}:00' if half_idx == 0 else f'{hour:02d}:30'
|
|
||||||
|
|
||||||
if half['status'] == 'off':
|
|
||||||
if current_status != 'off':
|
|
||||||
start_time = time_str
|
|
||||||
current_confirmed = half['confirmed']
|
|
||||||
current_queue = half['queue']
|
|
||||||
current_status = 'off'
|
|
||||||
else:
|
|
||||||
if current_status == 'off':
|
|
||||||
icon = '🔴' if current_confirmed else '🟠'
|
|
||||||
queue_text = f' (Ч.{current_queue})' if current_queue else ''
|
|
||||||
disconnections.append(f'{icon} <code>{start_time} - {time_str}</code>{queue_text}')
|
|
||||||
current_status = half['status']
|
|
||||||
|
|
||||||
# Если день закончился на отключении
|
|
||||||
if current_status == 'off':
|
|
||||||
icon = '🔴' if current_confirmed else '🟠'
|
|
||||||
queue_text = f' (Ч.{current_queue})' if current_queue else ''
|
|
||||||
next_hour = (day_blocks[-1]['hour'] + 1) % 24
|
|
||||||
end_time = f'{next_hour:02d}:00'
|
|
||||||
disconnections.append(f'{icon} <code>{start_time} - {end_time}</code>{queue_text}')
|
|
||||||
|
|
||||||
if disconnections:
|
|
||||||
lines.append('<b>⚡️ Розклад відключень</b>')
|
|
||||||
for idx, disc in enumerate(disconnections, 1):
|
|
||||||
lines.append(f'{idx}. {disc}')
|
|
||||||
|
|
||||||
lines.append('')
|
|
||||||
lines.append('<i>🔴 підтверджено • 🟠 можливо • 🟢 світло</i>')
|
|
||||||
|
|
||||||
return '\n'.join(lines)
|
|
||||||
|
|
||||||
|
|
||||||
def schedules_differ(old_schedule: list[dict] | None, new_schedule: list[dict] | None) -> bool:
|
|
||||||
"""Проверяет отличия между графиками"""
|
|
||||||
if old_schedule is None or new_schedule is None:
|
|
||||||
return True
|
|
||||||
|
|
||||||
if len(old_schedule) != len(new_schedule):
|
|
||||||
return True
|
|
||||||
|
|
||||||
for old, new in zip(old_schedule, new_schedule, strict=False):
|
|
||||||
if old['day'] >= 2:
|
|
||||||
break
|
|
||||||
|
|
||||||
if old['first_half'] != new['first_half'] or old['second_half'] != new['second_half']:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# УВЕДОМЛЕНИЯ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
async def send_to_all_users(message_text: str, parse_mode: str = 'HTML'):
|
|
||||||
"""Отправляет сообщение всем пользователям"""
|
|
||||||
if not ALLOWED_CHAT_IDS:
|
|
||||||
logger.warning('Нет допущенных ID чатов для отправки уведомлений')
|
|
||||||
return
|
|
||||||
|
|
||||||
for chat_id in ALLOWED_CHAT_IDS:
|
|
||||||
try:
|
|
||||||
await bot.send_message(chat_id, message_text, parse_mode=parse_mode)
|
|
||||||
logger.info(f'✅ Сообщение отправлено пользователю {chat_id}')
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'❌ Ошибка отправки пользователю {chat_id}: {e}')
|
|
||||||
await asyncio.sleep(0.5)
|
|
||||||
|
|
||||||
|
|
||||||
async def check_schedule():
|
|
||||||
"""Проверяет график и отправляет уведомления"""
|
|
||||||
global last_schedule
|
|
||||||
|
|
||||||
try:
|
|
||||||
logger.info('🔍 Проверка графика...')
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
new_schedule = parse_html(html)
|
|
||||||
|
|
||||||
if schedules_differ(last_schedule, new_schedule):
|
|
||||||
logger.info('✨ Обнаружены изменения!')
|
|
||||||
message = format_schedule_message(new_schedule, days_to_show=2)
|
|
||||||
|
|
||||||
if last_schedule is not None:
|
|
||||||
await send_to_all_users(f'🔄 <b>Графік оновлено!</b>\n\n{message}')
|
|
||||||
|
|
||||||
last_schedule = new_schedule
|
|
||||||
else:
|
|
||||||
logger.info('✓ Графік без змін')
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'❌ Ошибка при проверке графика: {e}')
|
|
||||||
|
|
||||||
|
|
||||||
async def check_upcoming_disconnections():
|
|
||||||
"""Проверяет предстоящие события и отправляет предупреждения за 5 минут"""
|
|
||||||
global last_notification_time
|
|
||||||
|
|
||||||
if last_schedule is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
now = datetime.now()
|
|
||||||
today_blocks = [b for b in last_schedule if b['day'] == 0]
|
|
||||||
|
|
||||||
# Создаем список всех переходов (off -> on или on -> off)
|
|
||||||
transitions = []
|
|
||||||
prev_status = None
|
|
||||||
|
|
||||||
for block in today_blocks:
|
|
||||||
hour = block['hour']
|
|
||||||
|
|
||||||
for half_idx, half in enumerate([block['first_half'], block['second_half']]):
|
|
||||||
minute = 0 if half_idx == 0 else 30
|
|
||||||
time_str = f'{hour:02d}:{minute:02d}'
|
|
||||||
|
|
||||||
current_status = half['status']
|
|
||||||
|
|
||||||
# Если статус изменился - это переход
|
|
||||||
if prev_status is not None and prev_status != current_status:
|
|
||||||
transitions.append(
|
|
||||||
{
|
|
||||||
'hour': hour,
|
|
||||||
'minute': minute,
|
|
||||||
'time_str': time_str,
|
|
||||||
'from_status': prev_status,
|
|
||||||
'to_status': current_status,
|
|
||||||
'confirmed': half.get('confirmed'),
|
|
||||||
'queue': half.get('queue'),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
prev_status = current_status
|
|
||||||
|
|
||||||
# Проверяем переходы
|
|
||||||
for transition in transitions:
|
|
||||||
event_time = now.replace(hour=transition['hour'], minute=transition['minute'], second=0, microsecond=0)
|
|
||||||
|
|
||||||
time_until = (event_time - now).total_seconds() / 60
|
|
||||||
notification_key = f'{transition["hour"]}:{transition["minute"]}_{transition["to_status"]}'
|
|
||||||
|
|
||||||
# Если за 5 минут до события (±1 минута) и еще не отправляли
|
|
||||||
if 4 <= time_until <= 6:
|
|
||||||
# Проверяем, не отправляли ли уже уведомление сегодня
|
|
||||||
if notification_key in last_notification_time:
|
|
||||||
last_notif_time = last_notification_time[notification_key]
|
|
||||||
if last_notif_time.date() == now.date():
|
|
||||||
continue # Уже отправляли сегодня
|
|
||||||
|
|
||||||
# Переход на ОТКЛЮЧЕНИЕ (on -> off)
|
|
||||||
if transition['from_status'] == 'on' and transition['to_status'] == 'off':
|
|
||||||
icon = '🔴' if transition['confirmed'] else '🟠'
|
|
||||||
status = 'підтверджено' if transition['confirmed'] else 'можливе'
|
|
||||||
queue_info = f' (Черга {transition["queue"]})' if transition['queue'] else ''
|
|
||||||
|
|
||||||
warning = (
|
|
||||||
f'⚠️ <b>УВАГА! ВІДКЛЮЧЕННЯ</b>\n\n'
|
|
||||||
f'Через ~5 хвилин\n'
|
|
||||||
f'Час: <code>{transition["time_str"]}</code>\n'
|
|
||||||
f'Статус: {icon} {status}{queue_info}'
|
|
||||||
)
|
|
||||||
|
|
||||||
await send_to_all_users(warning)
|
|
||||||
last_notification_time[notification_key] = now
|
|
||||||
logger.info(f'📢 Відправлено попередження про ВІДКЛЮЧЕННЯ в {transition["time_str"]}')
|
|
||||||
|
|
||||||
# Переход на ВКЛЮЧЕНИЕ (off -> on)
|
|
||||||
elif transition['from_status'] == 'off' and transition['to_status'] == 'on':
|
|
||||||
warning = (
|
|
||||||
f'✅ <b>УВАГА! ВКЛЮЧЕННЯ</b>\n\n'
|
|
||||||
f'Через ~5 хвилин буде світло\n'
|
|
||||||
f'Час: <code>{transition["time_str"]}</code>'
|
|
||||||
)
|
|
||||||
|
|
||||||
await send_to_all_users(warning)
|
|
||||||
last_notification_time[notification_key] = now
|
|
||||||
logger.info(f'📢 Відправлено попередження про ВКЛЮЧЕННЯ в {transition["time_str"]}')
|
|
||||||
|
|
||||||
|
|
||||||
async def monitoring_loop():
|
|
||||||
"""Основной цикл мониторинга"""
|
|
||||||
await check_schedule()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
await asyncio.sleep(CHECK_INTERVAL)
|
|
||||||
await check_schedule()
|
|
||||||
await check_upcoming_disconnections()
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'Ошибка в цикле мониторинга: {e}')
|
|
||||||
await asyncio.sleep(5)
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ОБРАБОТЧИКИ КОМАНД
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command('start'))
|
|
||||||
async def cmd_start(message: Message):
|
|
||||||
"""Обработчик /start"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer('❌ У вас немає доступу до цього бота.')
|
|
||||||
return
|
|
||||||
|
|
||||||
await message.answer(
|
|
||||||
'👋 <b>Ласкаво просимо!</b>\n\n'
|
|
||||||
'🤖 <b>Бот для моніторингу графіку відключень світла</b>\n\n'
|
|
||||||
'✨ <b>Можливості:</b>\n'
|
|
||||||
'• 📊 Перегляд графіку на сьогодні і завтра\n'
|
|
||||||
'• 🔔 Автоматичні сповіщення за 5 хвилин до подій\n'
|
|
||||||
'• 🔄 Моніторинг змін графіку\n\n'
|
|
||||||
'Використовуйте кнопки нижче 👇',
|
|
||||||
parse_mode='HTML',
|
|
||||||
reply_markup=get_main_keyboard(),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(lambda msg: msg.text == 'ℹ️ Про бота')
|
|
||||||
async def cmd_info(message: Message):
|
|
||||||
"""Показывает информацию о боте"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
return
|
|
||||||
|
|
||||||
await message.answer(
|
|
||||||
'<b>ℹ️ Про бота</b>\n\n'
|
|
||||||
'🚀 <b>Версія:</b> 2.2 (Стабільна)\n\n'
|
|
||||||
'📝 <b>Реліз-ноути:</b>\n'
|
|
||||||
'├ 15.11.2024: Адаптація під оновлену логіку сайту VOE\n'
|
|
||||||
'├ Виправлено парсинг half.left та half.right\n'
|
|
||||||
'├ Покращено визначення підтвердження відключень\n'
|
|
||||||
'└ Оптимізовано обробку статусу для всієї години\n\n'
|
|
||||||
'⚡ <b>Функціональність:</b>\n'
|
|
||||||
'├ Моніторинг графіку 24/7\n'
|
|
||||||
'├ Сповіщення за 5 хвилин\n'
|
|
||||||
'├ Детальна статистика дня\n'
|
|
||||||
'└ Красива візуалізація\n\n'
|
|
||||||
'🔐 <b>Безпека:</b> Використовуються .env файли\n'
|
|
||||||
'💾 <b>Джерело:</b> voe.com.ua',
|
|
||||||
parse_mode='HTML',
|
|
||||||
reply_markup=get_main_keyboard(),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command('schedule'))
|
|
||||||
async def cmd_schedule(message: Message):
|
|
||||||
"""Показывает полный график"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer('❌ У вас немає доступу.')
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer('⏳ Завантаження графіку...')
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
schedule = parse_html(html)
|
|
||||||
text = format_schedule_message(schedule, days_to_show=2)
|
|
||||||
await message.answer(text, parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(f'❌ <b>Помилка:</b> {str(e)}', parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command('today'))
|
|
||||||
async def cmd_today(message: Message):
|
|
||||||
"""Показывает график на сегодня"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer('❌ У вас немає доступу.')
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer('⏳ Завантаження графіку сьогодні...')
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
schedule = parse_html(html)
|
|
||||||
text = format_single_day_schedule(schedule, 0)
|
|
||||||
await message.answer(text, parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(f'❌ <b>Помилка:</b> {str(e)}', parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command('tomorrow'))
|
|
||||||
async def cmd_tomorrow(message: Message):
|
|
||||||
"""Показывает график на завтра"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer('❌ У вас немає доступу.')
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer('⏳ Завантаження графіку завтра...')
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
schedule = parse_html(html)
|
|
||||||
text = format_single_day_schedule(schedule, 1)
|
|
||||||
await message.answer(text, parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
# await message.answer("❌ Функція тимчасово недоступна. Чекаємо на оновлення сайту", parse_mode="HTML", reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(f'❌ <b>Помилка:</b> {str(e)}', parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command('check'))
|
|
||||||
async def cmd_check(message: Message):
|
|
||||||
"""Принудительная проверка графика"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer('❌ У вас немає доступу.')
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer('🔄 <b>Перевіряю графік...</b>', parse_mode='HTML')
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
new_schedule = parse_html(html)
|
|
||||||
|
|
||||||
prefix = (
|
|
||||||
'✅ <b>Знайдено зміни!</b>\n\n'
|
|
||||||
if schedules_differ(last_schedule, new_schedule)
|
|
||||||
else '✓ <b>Графік без змін</b>\n\n'
|
|
||||||
)
|
|
||||||
result = prefix + format_schedule_message(new_schedule, days_to_show=2)
|
|
||||||
|
|
||||||
await message.answer(result, parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(f'❌ <b>Помилка:</b> {str(e)}', parse_mode='HTML', reply_markup=get_main_keyboard())
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message()
|
|
||||||
async def handle_text(message: Message):
|
|
||||||
"""Обработчик текстовых сообщений и кнопок"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
return
|
|
||||||
|
|
||||||
text = message.text
|
|
||||||
|
|
||||||
# Кнопка "Графік"
|
|
||||||
if text == '📊 Графік':
|
|
||||||
await cmd_schedule(message)
|
|
||||||
|
|
||||||
# Кнопка "Сьогодні"
|
|
||||||
elif text == '📅 Сьогодні':
|
|
||||||
await cmd_today(message)
|
|
||||||
|
|
||||||
# Кнопка "Завтра"
|
|
||||||
elif text == '📅 Завтра':
|
|
||||||
await cmd_tomorrow(message)
|
|
||||||
|
|
||||||
# Кнопка "Оновити"
|
|
||||||
elif text == '🔄 Оновити':
|
|
||||||
await cmd_check(message)
|
|
||||||
|
|
||||||
# Кнопка "Про бота"
|
|
||||||
elif text == 'ℹ️ Про бота':
|
|
||||||
await cmd_info(message)
|
|
||||||
|
|
||||||
# Неизвестная команда
|
|
||||||
else:
|
|
||||||
await message.answer(
|
|
||||||
'❓ <b>Команда не розпізнана</b>\n\n'
|
|
||||||
'Використовуйте кнопки на клавіатурі або команди:\n'
|
|
||||||
'/start • /today • /tomorrow • /schedule • /check',
|
|
||||||
parse_mode='HTML',
|
|
||||||
reply_markup=get_main_keyboard(),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ГЛАВНАЯ ФУНКЦИЯ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
|
||||||
"""Главная функция"""
|
|
||||||
logger.info('=' * 50)
|
|
||||||
logger.info('ЗАПУСК БОТА V2.2 (stable 2.2, 15.11.2025)')
|
|
||||||
logger.info('=' * 50)
|
|
||||||
|
|
||||||
if not TELEGRAM_TOKEN or os.getenv('TELEGRAM_TOKEN', 'YOUR_TOKEN_HERE') == TELEGRAM_TOKEN:
|
|
||||||
logger.error('❌ TELEGRAM_TOKEN не конфігурований! Напишіть токен в .env файл')
|
|
||||||
return
|
|
||||||
|
|
||||||
if not ALLOWED_CHAT_IDS:
|
|
||||||
logger.error('❌ ALLOWED_CHAT_IDS не конфігуровані! Напишіть ID в .env файл')
|
|
||||||
return
|
|
||||||
|
|
||||||
logger.info(f'📌 Allowed chat ids: {ALLOWED_CHAT_IDS}')
|
|
||||||
logger.info(f'⏱ Інтервал перевірки: {CHECK_INTERVAL} сек')
|
|
||||||
logger.info('=' * 50)
|
|
||||||
|
|
||||||
# Запускаем мониторинг
|
|
||||||
monitoring_task = asyncio.create_task(monitoring_loop())
|
|
||||||
|
|
||||||
try:
|
|
||||||
await dp.start_polling(bot)
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
logger.info('⏹ Бот зупинений користувачем')
|
|
||||||
finally:
|
|
||||||
monitoring_task.cancel()
|
|
||||||
await bot.session.close()
|
|
||||||
logger.info('✓ Підключення закрито')
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
try:
|
|
||||||
asyncio.run(main())
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
logger.info('⏹ Завершено')
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[project]
|
|
||||||
name = "dtek-notif"
|
|
||||||
version = "0.1.0"
|
|
||||||
description = "Add your description here"
|
|
||||||
readme = "README.md"
|
|
||||||
requires-python = ">=3.13"
|
|
||||||
dependencies = []
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
requests>=2.31.0
|
|
||||||
beautifulsoup4>=4.12.0
|
|
||||||
aiogram>=3.3.0
|
|
||||||
python-dotenv>=1.0.0
|
|
||||||
aiohttp>=3.9.0
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
EDU_LOGIN=your_edu_login_here
|
|
||||||
EDU_PASSWORD=your_edu_password_here
|
|
||||||
EDU_URL_LOGIN=https://edu.edu.vn.ua/user/login
|
|
||||||
EDU_URL_VERIFY=https://edu.edu.vn.ua/course/userlist
|
|
||||||
PHPSESSID_INTERVAL=10
|
|
||||||
USER_AGENT="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36"
|
|
||||||
WEBINAR_URL=https://edu.edu.vn.ua/webinar/useractive
|
|
||||||
WEBINAR_CHECK_INTERVAL=60
|
|
||||||
REDIS_HOST=redis
|
|
||||||
REDIS_PORT=6379
|
|
||||||
PLAYWRIGHT_WS=ws://playwright-service:3000/ws
|
|
||||||
TZ=Europe/Kyiv
|
|
||||||
WEBINAR_TELEGRAM_TOKEN=your_telegram_bot_token_here
|
|
||||||
WEBINAR_ADMIN_ID=123456789
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis:8.10.1-alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- redis-data:/data
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 3s
|
|
||||||
retries: 5
|
|
||||||
|
|
||||||
playwright-service:
|
|
||||||
image: mcr.microsoft.com/playwright:v1.63.0-jammy
|
|
||||||
restart: unless-stopped
|
|
||||||
command: npx -y playwright@1.56.0 run-server --port 3000 --path /ws
|
|
||||||
|
|
||||||
session-keeper:
|
|
||||||
build: ./phpsessid-bot
|
|
||||||
image: gcr.forust.xyz/forust/session-keeper:latest
|
|
||||||
pull_policy: build
|
|
||||||
env_file: .env
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
redis:
|
|
||||||
condition: service_healthy
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "redis-cli -h redis EXISTS EDU_PHPSESSID | grep -q 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
start_period: 60s
|
|
||||||
|
|
||||||
webinar-checker:
|
|
||||||
build: ./webinar-checker
|
|
||||||
image: gcr.forust.xyz/forust/webinar-checker:latest
|
|
||||||
pull_policy: build
|
|
||||||
env_file: .env
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
redis:
|
|
||||||
condition: service_healthy
|
|
||||||
session-keeper:
|
|
||||||
condition: service_healthy
|
|
||||||
playwright-service:
|
|
||||||
condition: service_started
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
redis-data:
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: playwright-service
|
|
||||||
namespace: edu-master
|
|
||||||
labels:
|
|
||||||
app: edu-master-playwright
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: edu-master-playwright
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: edu-master-playwright
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: playwright
|
|
||||||
image: mcr.microsoft.com/playwright:v1.63.0-jammy
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command:
|
|
||||||
- npx
|
|
||||||
- -y
|
|
||||||
- playwright@1.56.0
|
|
||||||
- run-server
|
|
||||||
- --port
|
|
||||||
- "3000"
|
|
||||||
- --path
|
|
||||||
- /ws
|
|
||||||
ports:
|
|
||||||
- containerPort: 3000
|
|
||||||
readinessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: 3000
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
periodSeconds: 10
|
|
||||||
timeoutSeconds: 3
|
|
||||||
livenessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: 3000
|
|
||||||
initialDelaySeconds: 15
|
|
||||||
periodSeconds: 20
|
|
||||||
timeoutSeconds: 3
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: playwright-service
|
|
||||||
namespace: edu-master
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: edu-master-playwright
|
|
||||||
ports:
|
|
||||||
- name: ws
|
|
||||||
port: 3000
|
|
||||||
targetPort: 3000
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: StatefulSet
|
|
||||||
metadata:
|
|
||||||
name: redis
|
|
||||||
namespace: edu-master
|
|
||||||
labels:
|
|
||||||
app: edu-master-redis
|
|
||||||
spec:
|
|
||||||
serviceName: redis
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: edu-master-redis
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: edu-master-redis
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: redis
|
|
||||||
image: redis:8.10.1-alpine
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
ports:
|
|
||||||
- containerPort: 6379
|
|
||||||
volumeMounts:
|
|
||||||
- name: redis-data
|
|
||||||
mountPath: /data
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 25m
|
|
||||||
memory: 64Mi
|
|
||||||
limits:
|
|
||||||
cpu: 250m
|
|
||||||
memory: 256Mi
|
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command: ["redis-cli", "ping"]
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
periodSeconds: 5
|
|
||||||
timeoutSeconds: 3
|
|
||||||
livenessProbe:
|
|
||||||
exec:
|
|
||||||
command: ["redis-cli", "ping"]
|
|
||||||
initialDelaySeconds: 10
|
|
||||||
periodSeconds: 10
|
|
||||||
timeoutSeconds: 3
|
|
||||||
volumes:
|
|
||||||
- name: redis-data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: redis-data-pvc
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: redis-data-pvc
|
|
||||||
namespace: edu-master
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 1Gi
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: redis
|
|
||||||
namespace: edu-master
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: edu-master-redis
|
|
||||||
ports:
|
|
||||||
- name: redis
|
|
||||||
port: 6379
|
|
||||||
targetPort: 6379
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
# One-time Job to migrate redis state from docker compose to k8s (maintenance window).
|
|
||||||
# The .example file is not applied by the deploy pipeline (mask *.example.yaml).
|
|
||||||
#
|
|
||||||
# Runbook:
|
|
||||||
# 1. docker compose -f <repo>/edu_master/compose.yaml stop # SIGTERM -> redis will flush dump.rdb
|
|
||||||
# 2. docker run --rm -v edu_master_redis-data:/data \
|
|
||||||
# -v /tmp/edu-master-backup:/backup \
|
|
||||||
# redis:alpine sh -c "cp /data/dump.rdb /backup/ && ls -la /backup"
|
|
||||||
# 3. kubectl apply -f edu_master/k8s/namespace.yaml
|
|
||||||
# 4. kubectl apply -f <only the PVC from redis.yaml> # seed must come BEFORE redis pod starts
|
|
||||||
# 5. kubectl apply -f edu_master/k8s/restore-seed-job.yaml.example
|
|
||||||
# kubectl wait --for=condition=complete job/redis-restore-seed -n edu-master --timeout=120s
|
|
||||||
# 6. kubectl delete job redis-restore-seed -n edu-master
|
|
||||||
# 7. kubectl apply -f edu_master/k8s/ -R # apply remaining manifests
|
|
||||||
apiVersion: batch/v1
|
|
||||||
kind: Job
|
|
||||||
metadata:
|
|
||||||
name: redis-restore-seed
|
|
||||||
namespace: edu-master
|
|
||||||
spec:
|
|
||||||
backoffLimit: 2
|
|
||||||
ttlSecondsAfterFinished: 3600
|
|
||||||
template:
|
|
||||||
spec:
|
|
||||||
restartPolicy: Never
|
|
||||||
containers:
|
|
||||||
- name: seed
|
|
||||||
image: redis:alpine
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -ec
|
|
||||||
- |
|
|
||||||
ls -la /backup
|
|
||||||
cp /backup/dump.rdb /data/dump.rdb
|
|
||||||
chmod 644 /data/dump.rdb
|
|
||||||
ls -la /data
|
|
||||||
volumeMounts:
|
|
||||||
- name: redis-data
|
|
||||||
mountPath: /data
|
|
||||||
- name: backup
|
|
||||||
mountPath: /backup
|
|
||||||
readOnly: true
|
|
||||||
volumes:
|
|
||||||
- name: redis-data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: redis-data-pvc
|
|
||||||
- name: backup
|
|
||||||
hostPath:
|
|
||||||
path: /tmp/edu-master-backup
|
|
||||||
type: DirectoryOrCreate
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: edu-master-secrets
|
|
||||||
namespace: edu-master
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
# Session keeper credentials
|
|
||||||
KEEPER_LOGIN: ""
|
|
||||||
KEEPER_PASSWORD: ""
|
|
||||||
KEEPER_INTERVAL: "10"
|
|
||||||
# EDU links
|
|
||||||
EDU_URL_BASE: "https://edu.edu.vn.ua"
|
|
||||||
EDU_URL_LOGIN: "/user/login"
|
|
||||||
EDU_URL_COURSES: "/course/userlist"
|
|
||||||
EDU_URL_WEBINAR: "/webinar/useractive"
|
|
||||||
# Playwright
|
|
||||||
USER_AGENT: ""
|
|
||||||
PLAYWRIGHT_WS: "ws://playwright-service:3000/ws"
|
|
||||||
# Webinar-checker
|
|
||||||
WEBINAR_TELEGRAM_TOKEN: ""
|
|
||||||
WEBINAR_ADMIN_ID: ""
|
|
||||||
WEBINAR_CHECK_INTERVAL: "60"
|
|
||||||
# Database
|
|
||||||
REDIS_HOST: "redis"
|
|
||||||
REDIS_PORT: "6379"
|
|
||||||
TZ: "Europe/Kyiv"
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: session-keeper
|
|
||||||
namespace: edu-master
|
|
||||||
labels:
|
|
||||||
app: edu-master-session-keeper
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: edu-master-session-keeper
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: edu-master-session-keeper
|
|
||||||
spec:
|
|
||||||
initContainers:
|
|
||||||
- name: wait-redis
|
|
||||||
image: redis:8.10.1-alpine
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -ec
|
|
||||||
- |
|
|
||||||
i=0
|
|
||||||
until redis-cli -h redis ping | grep -q PONG; do
|
|
||||||
i=$((i+1))
|
|
||||||
[ "$i" -ge 300 ] && echo "TIMEOUT: redis not ready" && exit 1
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "redis is ready"
|
|
||||||
containers:
|
|
||||||
- name: session-keeper
|
|
||||||
image: gcr.forust.xyz/forust/session-keeper:latest
|
|
||||||
imagePullPolicy: Always
|
|
||||||
envFrom:
|
|
||||||
- secretRef:
|
|
||||||
name: edu-master-secrets
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 25m
|
|
||||||
memory: 96Mi
|
|
||||||
limits:
|
|
||||||
cpu: 250m
|
|
||||||
memory: 256Mi
|
|
||||||
readinessProbe:
|
|
||||||
exec:
|
|
||||||
command: ["/bin/sh", "-ec", "redis-cli -h redis EXISTS EDU_PHPSESSID | grep -q 1"]
|
|
||||||
initialDelaySeconds: 15
|
|
||||||
periodSeconds: 30
|
|
||||||
timeoutSeconds: 5
|
|
||||||
failureThreshold: 10
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: webinar-checker
|
|
||||||
namespace: edu-master
|
|
||||||
labels:
|
|
||||||
app: edu-master-webinar-checker
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: edu-master-webinar-checker
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: edu-master-webinar-checker
|
|
||||||
spec:
|
|
||||||
# Enforces dependency order like compose depends_on:
|
|
||||||
# redis healthy -> session-keeper healthy (EXISTS EDU_PHPSESSID) -> playwright started
|
|
||||||
initContainers:
|
|
||||||
- name: wait-deps
|
|
||||||
image: redis:8.10.1-alpine
|
|
||||||
command:
|
|
||||||
- /bin/sh
|
|
||||||
- -ec
|
|
||||||
- |
|
|
||||||
i=0
|
|
||||||
until redis-cli -h redis ping | grep -q PONG; do
|
|
||||||
i=$((i+1))
|
|
||||||
[ "$i" -ge 300 ] && echo "TIMEOUT: redis not ready" && exit 1
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "redis ok"
|
|
||||||
until [ "$(redis-cli -h redis EXISTS EDU_PHPSESSID)" = "1" ]; do
|
|
||||||
i=$((i+1))
|
|
||||||
[ "$i" -ge 300 ] && echo "TIMEOUT: no PHPSESSID (session-keeper down?)" && exit 1
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "PHPSESSID ok"
|
|
||||||
until nc -z playwright-service 3000; do
|
|
||||||
i=$((i+1))
|
|
||||||
[ "$i" -ge 300 ] && echo "TIMEOUT: playwright-service not reachable" && exit 1
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "playwright ok"
|
|
||||||
containers:
|
|
||||||
- name: webinar-checker
|
|
||||||
image: gcr.forust.xyz/forust/webinar-checker:latest
|
|
||||||
imagePullPolicy: Always
|
|
||||||
envFrom:
|
|
||||||
- secretRef:
|
|
||||||
name: edu-master-secrets
|
|
||||||
env:
|
|
||||||
- name: TZ
|
|
||||||
value: "Europe/Kyiv"
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: "50m"
|
|
||||||
memory: "128Mi"
|
|
||||||
limits:
|
|
||||||
cpu: "600m"
|
|
||||||
memory: "512Mi"
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
FROM python:3.11-slim
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Install system dependencies
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends redis-tools && rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Install dependencies
|
|
||||||
RUN pip install --no-cache-dir requests==2.32.3 redis==5.2.1
|
|
||||||
|
|
||||||
# Copy application code
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
# Run the bot
|
|
||||||
CMD ["python", "bot.py"]
|
|
||||||
@@ -1,132 +0,0 @@
|
|||||||
import logging
|
|
||||||
import os
|
|
||||||
import time
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
import redis
|
|
||||||
import requests
|
|
||||||
|
|
||||||
# Configure logging
|
|
||||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# Load configuration (adapted to .env keys)
|
|
||||||
def _env(key, default=None):
|
|
||||||
v = os.getenv(key, default)
|
|
||||||
if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")):
|
|
||||||
return v[1:-1]
|
|
||||||
return v
|
|
||||||
|
|
||||||
|
|
||||||
LOGIN = _env('KEEPER_LOGIN')
|
|
||||||
PASSWORD = _env('KEEPER_PASSWORD')
|
|
||||||
|
|
||||||
EDU_BASE = _env('EDU_URL_BASE', 'https://edu.edu.vn.ua')
|
|
||||||
EDU_LOGIN_PATH = _env('EDU_URL_LOGIN', '/user/login')
|
|
||||||
EDU_COURSES_PATH = _env('EDU_URL_COURSES', '/course/userlist')
|
|
||||||
URL_LOGIN = f'{EDU_BASE.rstrip("/")}/{EDU_LOGIN_PATH.lstrip("/")}'
|
|
||||||
URL_VERIFY = f'{EDU_BASE.rstrip("/")}/{EDU_COURSES_PATH.lstrip("/")}'
|
|
||||||
|
|
||||||
INTERVAL = int(_env('KEEPER_INTERVAL', 10))
|
|
||||||
USER_AGENT = _env(
|
|
||||||
'USER_AGENT',
|
|
||||||
'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36',
|
|
||||||
)
|
|
||||||
REDIS_HOST = _env('REDIS_HOST', 'redis')
|
|
||||||
REDIS_PORT = int(_env('REDIS_PORT', 6379))
|
|
||||||
|
|
||||||
SUCCESS_FILE = '/tmp/last_success' # noqa: S108
|
|
||||||
|
|
||||||
|
|
||||||
def touch_success_file():
|
|
||||||
"""Updates the timestamp of the success file for healthchecks."""
|
|
||||||
try:
|
|
||||||
with open(SUCCESS_FILE, 'w') as f:
|
|
||||||
f.write(str(datetime.now().timestamp()))
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'Failed to touch success file: {e}')
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
logger.info('Starting Session Keeper Bot')
|
|
||||||
|
|
||||||
# Connect to Redis
|
|
||||||
try:
|
|
||||||
redis_client = redis.Redis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
|
|
||||||
redis_client.ping()
|
|
||||||
logger.info(f'Connected to Redis at {REDIS_HOST}:{REDIS_PORT}')
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'Failed to connect to Redis: {e}')
|
|
||||||
return
|
|
||||||
|
|
||||||
session = requests.Session()
|
|
||||||
|
|
||||||
# Set headers
|
|
||||||
headers = {
|
|
||||||
'User-Agent': USER_AGENT,
|
|
||||||
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
|
|
||||||
'Accept-Language': 'en-US,en;q=0.9',
|
|
||||||
'Cache-Control': 'max-age=0',
|
|
||||||
'Upgrade-Insecure-Requests': '1',
|
|
||||||
'Sec-Fetch-Site': 'same-origin',
|
|
||||||
'Sec-Fetch-Mode': 'navigate',
|
|
||||||
'Sec-Fetch-User': '?1',
|
|
||||||
'Sec-Fetch-Dest': 'document',
|
|
||||||
'Sec-Ch-Ua': '"Not_A Brand";v="99", "Chromium";v="142"',
|
|
||||||
'Sec-Ch-Ua-Mobile': '?0',
|
|
||||||
'Sec-Ch-Ua-Platform': '"Linux"',
|
|
||||||
'Accept-Encoding': 'gzip, deflate, br',
|
|
||||||
'Priority': 'u=0, i',
|
|
||||||
}
|
|
||||||
session.headers.update(headers)
|
|
||||||
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
logger.info('Attempting login...')
|
|
||||||
|
|
||||||
# Login payload
|
|
||||||
payload = {'login': LOGIN, 'password': PASSWORD}
|
|
||||||
|
|
||||||
# Perform Login
|
|
||||||
# Note: The user request shows a POST to /user/login with form data
|
|
||||||
# We need to make sure we handle the PHPSESSID correctly.
|
|
||||||
# If we already have a PHPSESSID, requests will send it.
|
|
||||||
|
|
||||||
login_response = session.post(URL_LOGIN, data=payload, allow_redirects=True)
|
|
||||||
|
|
||||||
logger.info(f'Login Response Status: {login_response.status_code}')
|
|
||||||
logger.info(f'Cookies after login: {session.cookies.get_dict()}')
|
|
||||||
|
|
||||||
# Verify Session
|
|
||||||
logger.info('Verifying session...')
|
|
||||||
verify_response = session.get(URL_VERIFY, allow_redirects=False)
|
|
||||||
|
|
||||||
logger.info(f'Verify Response Status: {verify_response.status_code}')
|
|
||||||
|
|
||||||
if verify_response.status_code == 200:
|
|
||||||
logger.info('Session verification SUCCESS (200 OK).')
|
|
||||||
touch_success_file()
|
|
||||||
|
|
||||||
# Save PHPSESSID to Redis
|
|
||||||
phpsessid = session.cookies.get('PHPSESSID')
|
|
||||||
if phpsessid:
|
|
||||||
try:
|
|
||||||
redis_client.set('EDU_PHPSESSID', phpsessid)
|
|
||||||
logger.info(f'Saved PHPSESSID to Redis: {phpsessid}')
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'Failed to save PHPSESSID to Redis: {e}')
|
|
||||||
elif verify_response.status_code == 302:
|
|
||||||
logger.warning('Session verification FAILED (302 Redirect). Session might be invalid.')
|
|
||||||
else:
|
|
||||||
logger.warning(f'Session verification returned unexpected status: {verify_response.status_code}')
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f'An error occurred: {e}')
|
|
||||||
|
|
||||||
logger.info(f'Sleeping for {INTERVAL} minutes...')
|
|
||||||
time.sleep(INTERVAL * 60)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
FROM python:3.11-slim
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Install dependencies
|
|
||||||
RUN pip install --no-cache-dir pip==25.0.1 && pip install --no-cache-dir playwright==1.56.0 redis==5.2.1 requests==2.32.3 "python-telegram-bot[job-queue]==21.10"
|
|
||||||
|
|
||||||
COPY checker.py .
|
|
||||||
|
|
||||||
CMD ["python", "checker.py"]
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,7 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
errorpage:
|
errorpage:
|
||||||
build: .
|
build: .
|
||||||
image: gcr.forust.xyz/forust/error-pages:latest
|
image: gcr.forust.xyz/forust/error-pages:prod
|
||||||
pull_policy: build
|
pull_policy: build
|
||||||
container_name: error-pages
|
container_name: error-pages
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
File renamed without changes.
@@ -20,6 +20,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: error-pages
|
app: error-pages
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -27,7 +29,21 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: error-pages
|
- name: error-pages
|
||||||
image: gcr.forust.xyz/forust/error-pages:latest
|
image: gcr.forust.xyz/forust/error-pages:prod
|
||||||
|
# p95 6M, max 10M, no limit before.
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: "10m"
|
||||||
|
memory: "32Mi"
|
||||||
|
limits:
|
||||||
|
memory: "128Mi"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /404.html
|
||||||
|
port: 80
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 2
|
||||||
|
failureThreshold: 3
|
||||||
---
|
---
|
||||||
+6
-3
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: docker.gitea.com/gitea:1.27.3
|
image: docker.gitea.com/gitea:28.0.0
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -13,9 +13,12 @@ services:
|
|||||||
- GITEA__database__PASSWD=gitea
|
- GITEA__database__PASSWD=gitea
|
||||||
- GITEA__database__NAME=gitea
|
- GITEA__database__NAME=gitea
|
||||||
# Server
|
# Server
|
||||||
- GITEA__server__ROOT_URL=https://gitea.forust.xyz
|
- GITEA__server__ROOT_URL=https://git.forust.xyz
|
||||||
- GITEA__server__SSH_DOMAIN=gitssh.forust.xyz
|
- GITEA__server__SSH_DOMAIN=gitssh.forust.xyz
|
||||||
- GITEA__server__SSH_PORT=2221
|
- GITEA__server__SSH_PORT=2221
|
||||||
|
# Pin 28.0 defaults explicitly (see k8s/config.yaml for rationale)
|
||||||
|
- GITEA__service__DISABLE_REGISTRATION=true
|
||||||
|
- GITEA__actions__RUN_RETENTION_DAYS=90
|
||||||
# Mailer
|
# Mailer
|
||||||
- GITEA__mailer__ENABLED=true
|
- GITEA__mailer__ENABLED=true
|
||||||
- GITEA__mailer__FROM=${SERVICE_EMAIL}
|
- GITEA__mailer__FROM=${SERVICE_EMAIL}
|
||||||
@@ -34,7 +37,7 @@ services:
|
|||||||
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
||||||
|
|
||||||
# Prod Router
|
# Prod Router
|
||||||
- "traefik.http.routers.gitea.rule=Host(`gitea.forust.xyz`)"
|
- "traefik.http.routers.gitea.rule=Host(`git.forust.xyz`) || Host(`gitea.forust.xyz`)"
|
||||||
- "traefik.http.routers.gitea.entrypoints=websecure"
|
- "traefik.http.routers.gitea.entrypoints=websecure"
|
||||||
- "traefik.http.routers.gitea.tls.certresolver"
|
- "traefik.http.routers.gitea.tls.certresolver"
|
||||||
# Local Router
|
# Local Router
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: gitea-prod-tls
|
||||||
|
namespace: gitea
|
||||||
|
spec:
|
||||||
|
secretName: gitea-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- gcr.forust.xyz
|
||||||
|
- gitea.forust.xyz
|
||||||
|
- git.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: gitea
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
+13
-2
@@ -4,11 +4,14 @@ metadata:
|
|||||||
name: gitea-config
|
name: gitea-config
|
||||||
namespace: gitea
|
namespace: gitea
|
||||||
data:
|
data:
|
||||||
GITEA__server__DOMAIN: "gitea.forust.xyz"
|
GITEA__server__ROOT_URL: "https://git.forust.xyz"
|
||||||
GITEA__server__ROOT_URL: "https://gitea.forust.xyz"
|
|
||||||
GITEA__server__SSH_DOMAIN: "gitssh.forust.xyz"
|
GITEA__server__SSH_DOMAIN: "gitssh.forust.xyz"
|
||||||
GITEA__server__SSH_PORT: "2221"
|
GITEA__server__SSH_PORT: "2221"
|
||||||
|
|
||||||
|
GITEA__service__DISABLE_REGISTRATION: "true"
|
||||||
|
|
||||||
|
GITEA__actions__RUN_RETENTION_DAYS: "90"
|
||||||
|
|
||||||
GITEA__database__DB_TYPE: "postgres"
|
GITEA__database__DB_TYPE: "postgres"
|
||||||
GITEA__database__HOST: "postgres.database.svc.cluster.local:5432"
|
GITEA__database__HOST: "postgres.database.svc.cluster.local:5432"
|
||||||
GITEA__database__NAME: "gitea"
|
GITEA__database__NAME: "gitea"
|
||||||
@@ -17,6 +20,14 @@ data:
|
|||||||
|
|
||||||
GITEA__mailer__ENABLED: "false"
|
GITEA__mailer__ENABLED: "false"
|
||||||
|
|
||||||
|
GITEA__metrics__ENABLED: "true"
|
||||||
|
|
||||||
|
# No code/issue search needed: bleve reindexes the whole issue index on
|
||||||
|
# every pod restart (cron.rebuild_issue_indexer RUN_AT_START) and hammers
|
||||||
|
# the rotational disk for an hour. "db" serves issue search from postgres.
|
||||||
|
GITEA__indexer__ISSUE_INDEXER_TYPE: "db"
|
||||||
|
GITEA__indexer__REPO_INDEXER_ENABLED: "false"
|
||||||
|
|
||||||
GITEA__log__logger.access.MODE: "console, file"
|
GITEA__log__logger.access.MODE: "console, file"
|
||||||
USER_UID: "1000"
|
USER_UID: "1000"
|
||||||
USER_GID: "1000"
|
USER_GID: "1000"
|
||||||
+10
-4
@@ -3,6 +3,8 @@ kind: Service
|
|||||||
metadata:
|
metadata:
|
||||||
name: gitea-service
|
name: gitea-service
|
||||||
namespace: gitea
|
namespace: gitea
|
||||||
|
labels:
|
||||||
|
app: gitea
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
app: gitea
|
app: gitea
|
||||||
@@ -17,6 +19,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: gitea-deployment
|
name: gitea-deployment
|
||||||
namespace: gitea
|
namespace: gitea
|
||||||
spec:
|
spec:
|
||||||
@@ -24,6 +28,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: gitea
|
app: gitea
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -31,7 +37,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: gitea
|
- name: gitea
|
||||||
image: docker.gitea.com/gitea:1.27.3
|
image: gitea/gitea:28.0.0
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: gitea-config
|
name: gitea-config
|
||||||
@@ -47,10 +53,10 @@ spec:
|
|||||||
mountPath: /data
|
mountPath: /data
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "512Mi"
|
memory: "320Mi"
|
||||||
cpu: "300m"
|
cpu: "100m"
|
||||||
limits:
|
limits:
|
||||||
memory: "1.5Gi"
|
memory: "1Gi"
|
||||||
cpu: "1300m"
|
cpu: "1300m"
|
||||||
volumes:
|
volumes:
|
||||||
- name: gitea-data
|
- name: gitea-data
|
||||||
|
|||||||
@@ -7,24 +7,19 @@ spec:
|
|||||||
entryPoints:
|
entryPoints:
|
||||||
- websecure
|
- websecure
|
||||||
routes:
|
routes:
|
||||||
- match: Host(`gitea.forust.xyz`)
|
# Metrics are scraped directly through the cluster Service.
|
||||||
|
- match: (Host(`gitea.forust.xyz`) || Host(`git.forust.xyz`)) && !PathPrefix(`/metrics`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
services:
|
services:
|
||||||
- name: gitea-service
|
- name: gitea-service
|
||||||
port: 3000
|
port: 3000
|
||||||
- match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`)
|
- match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
services:
|
services:
|
||||||
- name: gitea-service
|
- name: gitea-service
|
||||||
port: 3000
|
port: 3000
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: gitea-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -35,7 +30,7 @@ spec:
|
|||||||
entryPoints:
|
entryPoints:
|
||||||
- websecure
|
- websecure
|
||||||
routes:
|
routes:
|
||||||
- match: Host(`gitea.workstation.internal`) || Host(`gitea.gigaforust.internal`)
|
- match: (Host(`gitea.workstation.internal`) || Host(`gitea.gigaforust.internal`)) || (Host(`git.workstation.internal`) || Host(`git.gigaforust.internal`))
|
||||||
kind: Rule
|
kind: Rule
|
||||||
services:
|
services:
|
||||||
- name: gitea-service
|
- name: gitea-service
|
||||||
@@ -45,6 +40,9 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: gitea-service
|
- name: gitea-service
|
||||||
port: 3000
|
port: 3000
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRouteTCP
|
kind: IngressRouteTCP
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
apiVersion: monitoring.coreos.com/v1
|
||||||
|
kind: ServiceMonitor
|
||||||
|
metadata:
|
||||||
|
name: gitea
|
||||||
|
namespace: gitea
|
||||||
|
labels:
|
||||||
|
release: prometheus-stack
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: gitea
|
||||||
|
endpoints:
|
||||||
|
- port: http
|
||||||
|
path: /metrics
|
||||||
|
interval: 30s
|
||||||
|
scrapeTimeout: 10s
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: glance-prod-tls
|
||||||
|
namespace: glance
|
||||||
|
spec:
|
||||||
|
secretName: glance-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- forust.xyz
|
||||||
|
- www.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: glance
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
@@ -177,8 +177,8 @@ data:
|
|||||||
# url: https://gitssh.forust.xyz
|
# url: https://gitssh.forust.xyz
|
||||||
# - title: gcr.forust.xyz
|
# - title: gcr.forust.xyz
|
||||||
# url: https://gcr.forust.xyz/v2/
|
# url: https://gcr.forust.xyz/v2/
|
||||||
- title: gitea.forust.xyz
|
- title: git.forust.xyz
|
||||||
url: https://gitea.forust.xyz
|
url: https://git.forust.xyz
|
||||||
- title: nextcloud.forust.xyz
|
- title: nextcloud.forust.xyz
|
||||||
url: https://nextcloud.forust.xyz
|
url: https://nextcloud.forust.xyz
|
||||||
- title: mc.forust.xyz
|
- title: mc.forust.xyz
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ spec:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/auto: "true"
|
||||||
name: glance-deployment
|
name: glance-deployment
|
||||||
namespace: glance
|
namespace: glance
|
||||||
spec:
|
spec:
|
||||||
@@ -20,6 +22,8 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: glance
|
app: glance
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
@@ -57,17 +61,17 @@ spec:
|
|||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: "50m"
|
cpu: "50m"
|
||||||
memory: "64Mi"
|
memory: "32Mi"
|
||||||
limits:
|
limits:
|
||||||
cpu: "200m"
|
cpu: "200m"
|
||||||
memory: "256Mi"
|
memory: "128Mi"
|
||||||
volumes:
|
volumes:
|
||||||
- name: glance-config
|
- name: glance-config
|
||||||
configMap:
|
configMap:
|
||||||
name: glance-config
|
name: glance-config
|
||||||
- name: glance-assets
|
- name: glance-assets
|
||||||
configMap:
|
configMap:
|
||||||
name: glance-config
|
name: glance-assets
|
||||||
- name: docker-socket
|
- name: docker-socket
|
||||||
hostPath:
|
hostPath:
|
||||||
path: /var/run/docker.sock
|
path: /var/run/docker.sock
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ spec:
|
|||||||
- name: glance-service
|
- name: glance-service
|
||||||
port: 8080
|
port: 8080
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
secretName: glance-prod-tls
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
@@ -35,6 +35,9 @@ spec:
|
|||||||
services:
|
services:
|
||||||
- name: glance-service
|
- name: glance-service
|
||||||
port: 8080
|
port: 8080
|
||||||
|
tls:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.io/v1alpha1
|
||||||
kind: Middleware
|
kind: Middleware
|
||||||
|
|||||||
File renamed without changes.
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
headscale:
|
headscale:
|
||||||
image: headscale/headscale:0.29.3
|
image: headscale/headscale:v0.29.4
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
container_name: headscale-server
|
container_name: headscale-server
|
||||||
command: serve
|
command: serve
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# # Dev server_url
|
# # Dev server_url
|
||||||
# server_url: https://hs.dev_internal_domain.internal
|
# server_url: https://hs.dev_internal_domain.internal
|
||||||
listen_addr: 0.0.0.0:8080
|
listen_addr: 0.0.0.0:8080
|
||||||
metrics_listen_addr: 127.0.0.1:9090
|
metrics_listen_addr: 0.0.0.0:9090
|
||||||
grpc_listen_addr: 127.0.0.1:50443
|
grpc_listen_addr: 127.0.0.1:50443
|
||||||
grpc_allow_insecure: false
|
grpc_allow_insecure: false
|
||||||
noise:
|
noise:
|
||||||
|
|||||||
File renamed without changes.
@@ -0,0 +1,41 @@
|
|||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: headscale-prod-tls
|
||||||
|
namespace: headscale
|
||||||
|
spec:
|
||||||
|
secretName: headscale-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- hs.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: headplane-prod-tls
|
||||||
|
namespace: headscale
|
||||||
|
spec:
|
||||||
|
secretName: headplane-prod-tls
|
||||||
|
dnsNames:
|
||||||
|
- hp.forust.xyz
|
||||||
|
issuerRef:
|
||||||
|
name: letsencrypt-prod
|
||||||
|
kind: ClusterIssuer
|
||||||
|
---
|
||||||
|
apiVersion: cert-manager.io/v1
|
||||||
|
kind: Certificate
|
||||||
|
metadata:
|
||||||
|
name: internal-wildcard-tls
|
||||||
|
namespace: headscale
|
||||||
|
spec:
|
||||||
|
secretName: internal-wildcard-tls
|
||||||
|
dnsNames:
|
||||||
|
- "*.workstation.internal"
|
||||||
|
- "*.gigaforust.internal"
|
||||||
|
- workstation.internal
|
||||||
|
- gigaforust.internal
|
||||||
|
issuerRef:
|
||||||
|
name: internal-ca
|
||||||
|
kind: ClusterIssuer
|
||||||
Loaded 100 of 434 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user