mirror of
https://github.com/nomadkaraoke/karaoke-gen.git
synced 2026-11-20 13:07:57 +09:00
## Summary
Phase 1 of moving encoding to AWS. EC2 is paid for by the AWS Activate
credits (acct 790139457751, expiring 2028-10-31).
- **Plan:** `docs/archive/2026-10-29-aws-encoding-worker-plan.md`.
- **Benchmark** (3 real prod jobs replayed): an EC2 c7a.4xlarge matched
or beat GCE c4d-highcpu-16.
The EC2 box runs the **unchanged** `gce_encoding` worker service and
joins the existing candidate pool as `provider: aws`. The existing
failover, active override, lost-job detection and stockout cooldowns all
apply to it as they are.
## Changes
- **`backend/services/aws_encoding_compute.py` (new):**
`AwsComputeAdapter` looks to the manager like the
`compute_v1.InstancesClient` methods it uses.
- EC2 states map to GCE statuses.
- EC2 capacity errors are added to `CAPACITY_ERROR_CODES`.
- A missing instance raises `NotFound`.
- Controller credentials come from Secret Manager
`aws-encoding-controller-credentials`.
- **`EncodingWorkerManager`:**
- `_compute_for(vm)` sends AWS VMs to the adapter; the GCE paths are
untouched.
- A shared `parse_fallback_vms` passes `provider`/`instance_id`/`region`
through.
- `ranked_candidates()` is used by both the encode path and the warmups.
- `ensure_preferred_running()` behaves **exactly like
`ensure_primary_running` whenever the GCE primary ranks first**, which
is today's case.
- An AWS control-plane fault fails over to the GCE candidates.
- **Ranking:** `SPEED_RANK["c7a"] = 90`, so AWS is the last resort by
default. Firestore `config/encoding-worker.speed_rank_overrides =
{"c7a": 5}` makes it preferred, with no deploy.
- **Isolation from GCE-only tooling:**
- The override now records `active_override_provider`.
- The CI blue-green deploy, `deploy_promote` and the idle Cloud Function
all ignore the AWS worker; it hot-updates its wheel per job.
- A GCE promotion clears any stale provider tag.
- **Worker:**
- Uses `gcloud storage` on AWS, because gsutil can't use WIF credential
files. GCE keeps gsutil.
- `infrastructure/encoding-worker/aws/` adds:
- `provision.sh`, as EC2 user-data;
- `startup-aws.sh`, uploaded by CI;
- `idle-watchdog.py`, an idle self-stop that runs as its own systemd
timer.
- **Infra (GCP), already applied with `/gcp-admin`:**
- The WIF pool `aws-encoding`, plus an AWS provider that only admits the
`nomad-encoding-worker` role, federated to `encoding-worker@`.
- The secret `aws-encoding-controller-credentials`.
- Preview and apply: 4 creates, 288 unchanged.
- **Infra (AWS):** a new Pulumi project `infrastructure/aws` (stack
`nomadkaraoke/prod`):
- the c7a.8xlarge **persistent Spot** worker, which stops on
interruption or shutdown;
- an Elastic IP;
- a security group on 8080 (API key, same as the GCE firewall);
- the worker role with SSM;
- a tag-scoped `nomad-encoding-controller` user.
- Preview: 10 creates. **I apply it after merge**, because the box
provisions from the deployed wheel and boot scripts.
- `boto3` is now an explicit dependency.
- CI also runs the `encoding_worker_idle` function tests, in the job
renamed "Infra - Cloud Function tests".
## Rollout (after merge)
1. **Stage A:** `pulumi up` the AWS stack. Store the controller key in
the secret, then add the worker's entry to
`encoding-worker-fallback-vms`. It's inert unless both c4d and c2d stock
out.
2. **Stage B:** a supervised `speed_rank_overrides {"c7a": 5}` window.
Run real jobs, then compare timings and outputs, including a visual
check of the portrait video.
3. **Stage C:** keep it preferred. After a clean week, delete the c4d
pair.
Phase 2, running distribution (Dropbox/YouTube/Drive uploads) from AWS,
follows in a separate PR.
## Testing
- **New tests:**
- adapter: botocore `Stubber`, covering the state map, capacity and
NotFound handling;
- manager routing and ranking with overrides;
- `ensure_preferred_running` branches;
- failover on an AWS control-plane fault;
- provider tagging;
- deploy_promote exclusions;
- the idle function skipping AWS;
- watchdog decisions;
- the gcs CLI choice.
- **Updated** the candidate and warmup-route tests to the new seams.
- **Full backend + unit suites** have no new failures. The local
emulator and cross-suite failures are identical on main.
- **Local CodeRabbit:** 2 findings, both fixed (failover on AWS faults;
stale provider tag).
@coderabbitai ignore
🤖 Generated with [Claude Code](https://claude.com/claude-code)
https://claude.ai/code/session_012RYLVSR5qgwsxTQtvGimKF
---------
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
60 lines
2.4 KiB
Python
60 lines
2.4 KiB
Python
"""Workload Identity Federation for the AWS encoding worker.
|
|
|
|
The AWS encoding worker (EC2 in Nomad's AWS account) authenticates to GCP as
|
|
the existing ``encoding-worker`` service account with no keys: the instance's
|
|
IAM role ``nomad-encoding-worker`` is exchanged for a short-lived GCP token via
|
|
this pool/provider. The box's credential config is generated from the provider
|
|
name in infrastructure/encoding-worker/aws/provision.sh.
|
|
"""
|
|
|
|
import pulumi
|
|
import pulumi_gcp as gcp
|
|
|
|
from config import PROJECT_ID
|
|
|
|
AWS_ACCOUNT_ID = "790139457751"
|
|
AWS_WORKER_ROLE = "nomad-encoding-worker"
|
|
POOL_ID = "aws-encoding"
|
|
PROVIDER_ID = f"aws-{AWS_ACCOUNT_ID}"
|
|
|
|
|
|
def create_aws_encoding_wif(encoding_worker_sa: gcp.serviceaccount.Account) -> dict:
|
|
pool = gcp.iam.WorkloadIdentityPool(
|
|
"aws-encoding-wif-pool",
|
|
workload_identity_pool_id=POOL_ID,
|
|
display_name="AWS encoding worker",
|
|
description="EC2 encoding worker in Nomad's AWS account (karaoke-gen)",
|
|
)
|
|
provider = gcp.iam.WorkloadIdentityPoolProvider(
|
|
"aws-encoding-wif-provider",
|
|
workload_identity_pool_id=pool.workload_identity_pool_id,
|
|
workload_identity_pool_provider_id=PROVIDER_ID,
|
|
display_name="Nomad AWS account",
|
|
aws=gcp.iam.WorkloadIdentityPoolProviderAwsArgs(account_id=AWS_ACCOUNT_ID),
|
|
attribute_mapping={
|
|
"google.subject": "assertion.arn",
|
|
"attribute.aws_role": (
|
|
"assertion.arn.contains('assumed-role') ? "
|
|
"assertion.arn.extract('{account_arn}assumed-role/') + 'assumed-role/' + "
|
|
"assertion.arn.extract('assumed-role/{role_name}/') : assertion.arn"
|
|
),
|
|
},
|
|
# Only the worker's role in Nomad's account may federate.
|
|
attribute_condition=(
|
|
f"attribute.aws_role == 'arn:aws:sts::{AWS_ACCOUNT_ID}:assumed-role/{AWS_WORKER_ROLE}'"
|
|
),
|
|
)
|
|
binding = gcp.serviceaccount.IAMMember(
|
|
"aws-encoding-worker-wif-user",
|
|
service_account_id=encoding_worker_sa.name,
|
|
role="roles/iam.workloadIdentityUser",
|
|
member=pool.name.apply(
|
|
lambda name: (
|
|
f"principalSet://iam.googleapis.com/{name}/attribute.aws_role/"
|
|
f"arn:aws:sts::{AWS_ACCOUNT_ID}:assumed-role/{AWS_WORKER_ROLE}"
|
|
)
|
|
),
|
|
)
|
|
pulumi.export("aws_encoding_wif_provider", provider.name)
|
|
return {"pool": pool, "provider": provider, "binding": binding}
|