## Context The remote-executor pattern that SSHed into the DevVM (10.0.10.10) to run `claude -p` was fully migrated to the in-cluster service `claude-agent-service.claude-agent.svc:8080/execute` in commits42f1c3cfand99180bec(2026-04-18). Five parallel codebase audits (GH Actions, Woodpecker + scripts, K8s CronJobs/Deployments, n8n, local scripts/hooks/docs) confirmed zero remaining SSH+claude sites. This commit removes two cleanup artifacts left behind by that migration. ## This change 1. Deletes `.claude/skills/archived/setup-remote-executor.md` — the archived skill doc for the obsolete SSH-based pattern. Already in `archived/`, harmless but noise; deleting prevents anyone copy-pasting the old approach. 2. Removes `kubernetes_secret.ssh_key` from `stacks/claude-agent-service/main.tf`. The Secret was created from the `devvm_ssh_key` field at Vault `secret/ci/infra` but was never mounted into the agent pod. The pod's `git-init` init container uses HTTPS + `$GITHUB_TOKEN` exclusively and force-rewrites every `git@github.com:` and `https://github.com/` URL via `git config url.insteadOf`, so no downstream `git` invocation could fall through to SSH even if it tried. 3. Removes the now-orphaned `data "vault_kv_secret_v2" "ci_secrets"` block — the SSH key resource was its only consumer. ## What is NOT in this change - The `devvm_ssh_key` field at Vault `secret/ci/infra` stays in place. Removing it requires read/modify/put of the full secret and the upside is one unused Vault key. Not worth it without strong justification. - DevVM host decommission is out of scope (separate audit needed for non-Claude users of the host). - Pre-existing `terraform fmt` warnings at lines 464-505 (CronJob alignment) left untouched per no-adjacent-refactor rule. ## Test plan ### Automated - `terraform fmt -check stacks/claude-agent-service/main.tf` — only the pre-existing lines 464-505 are flagged; no new fmt warnings introduced by these deletions. ### Manual verification 1. `cd infra/stacks/claude-agent-service && ../../scripts/tg apply` 2. Expect exactly one resource destroyed: `kubernetes_secret.ssh_key`. The `ci_secrets` data source removal is plan-time only; does not appear in resource counts. 3. `kubectl -n claude-agent get secret ssh-key` → `NotFound`. 4. `kubectl -n claude-agent get pod` → both pods Running, no restart events. 5. Submit a synthetic agent job via HTTP API to confirm pipeline still works: curl -X POST http://claude-agent-service.claude-agent.svc.cluster.local:8080/execute with a minimal prompt; expect job completes with `exit_code=0`. Closes: code-bck Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
553 lines
15 KiB
HCL
553 lines
15 KiB
HCL
data "vault_kv_secret_v2" "secrets" {
|
|
mount = "secret"
|
|
name = "claude-agent-service"
|
|
}
|
|
|
|
data "vault_kv_secret_v2" "viktor_secrets" {
|
|
mount = "secret"
|
|
name = "viktor"
|
|
}
|
|
|
|
locals {
|
|
namespace = "claude-agent"
|
|
image = "registry.viktorbarzin.me/claude-agent-service"
|
|
image_tag = "382d6b14"
|
|
labels = {
|
|
app = "claude-agent-service"
|
|
}
|
|
}
|
|
|
|
# --- Namespace ---
|
|
|
|
resource "kubernetes_namespace" "claude_agent" {
|
|
metadata {
|
|
name = local.namespace
|
|
labels = {
|
|
tier = local.tiers.aux
|
|
"resource-governance/custom-limitrange" = "true"
|
|
"resource-governance/custom-quota" = "true"
|
|
}
|
|
}
|
|
}
|
|
|
|
# --- Secrets ---
|
|
|
|
resource "kubernetes_manifest" "external_secret" {
|
|
manifest = {
|
|
apiVersion = "external-secrets.io/v1beta1"
|
|
kind = "ExternalSecret"
|
|
metadata = {
|
|
name = "claude-agent-secrets"
|
|
namespace = local.namespace
|
|
}
|
|
spec = {
|
|
refreshInterval = "15m"
|
|
secretStoreRef = {
|
|
name = "vault-kv"
|
|
kind = "ClusterSecretStore"
|
|
}
|
|
target = {
|
|
name = "claude-agent-secrets"
|
|
}
|
|
data = [
|
|
{
|
|
secretKey = "GITHUB_TOKEN"
|
|
remoteRef = {
|
|
key = "viktor"
|
|
property = "github_pat"
|
|
}
|
|
},
|
|
{
|
|
secretKey = "API_BEARER_TOKEN"
|
|
remoteRef = {
|
|
key = "claude-agent-service"
|
|
property = "api_bearer_token"
|
|
}
|
|
},
|
|
{
|
|
# Long-lived OAuth token (1-year) from `claude setup-token`.
|
|
# Preferred over the short-lived .credentials.json — CLI picks this up and
|
|
# skips the refresh flow entirely. Rotate yearly; alert 30d before expiry.
|
|
secretKey = "CLAUDE_CODE_OAUTH_TOKEN"
|
|
remoteRef = {
|
|
key = "claude-agent-service"
|
|
property = "claude_oauth_token"
|
|
}
|
|
},
|
|
]
|
|
}
|
|
}
|
|
depends_on = [kubernetes_namespace.claude_agent]
|
|
}
|
|
|
|
# SOPS age key for terraform state decryption
|
|
resource "kubernetes_secret" "sops_age_key" {
|
|
metadata {
|
|
name = "sops-age-key"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
data = {
|
|
"keys.txt" = data.vault_kv_secret_v2.viktor_secrets.data["sops_age_key_devvm"]
|
|
}
|
|
type = "Opaque"
|
|
}
|
|
|
|
# Claude OAuth credentials (for claude -p)
|
|
resource "kubernetes_secret" "claude_credentials" {
|
|
metadata {
|
|
name = "claude-credentials"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
data = {
|
|
".credentials.json" = data.vault_kv_secret_v2.secrets.data["claude_credentials_json"]
|
|
}
|
|
type = "Opaque"
|
|
}
|
|
|
|
# git-crypt key for repo decryption
|
|
resource "kubernetes_config_map" "git_crypt_key" {
|
|
metadata {
|
|
name = "git-crypt-key"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
binary_data = {
|
|
"key" = filebase64("${path.root}/../../.git/git-crypt/keys/default")
|
|
}
|
|
}
|
|
|
|
# --- RBAC ---
|
|
|
|
resource "kubernetes_service_account" "claude_agent" {
|
|
metadata {
|
|
name = "claude-agent"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_cluster_role" "claude_agent" {
|
|
metadata {
|
|
name = "claude-agent"
|
|
}
|
|
|
|
rule {
|
|
verbs = ["get", "list", "watch"]
|
|
api_groups = ["", "apps", "batch"]
|
|
resources = ["pods", "pods/log", "nodes", "events", "deployments", "services", "namespaces", "jobs", "cronjobs", "configmaps", "replicasets", "statefulsets", "daemonsets"]
|
|
}
|
|
|
|
rule {
|
|
verbs = ["patch", "update"]
|
|
api_groups = ["apps"]
|
|
resources = ["deployments"]
|
|
}
|
|
|
|
rule {
|
|
verbs = ["create"]
|
|
api_groups = [""]
|
|
resources = ["pods/exec"]
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_cluster_role_binding" "claude_agent" {
|
|
metadata {
|
|
name = "claude-agent"
|
|
}
|
|
|
|
subject {
|
|
kind = "ServiceAccount"
|
|
name = kubernetes_service_account.claude_agent.metadata[0].name
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
|
|
role_ref {
|
|
api_group = "rbac.authorization.k8s.io"
|
|
kind = "ClusterRole"
|
|
name = kubernetes_cluster_role.claude_agent.metadata[0].name
|
|
}
|
|
}
|
|
|
|
# --- Storage ---
|
|
|
|
resource "kubernetes_persistent_volume_claim" "workspace" {
|
|
wait_until_bound = false
|
|
metadata {
|
|
name = "claude-agent-workspace-encrypted"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
annotations = {
|
|
"resize.topolvm.io/threshold" = "80%"
|
|
"resize.topolvm.io/increase" = "100%"
|
|
"resize.topolvm.io/storage_limit" = "20Gi"
|
|
}
|
|
}
|
|
spec {
|
|
access_modes = ["ReadWriteOnce"]
|
|
storage_class_name = "proxmox-lvm-encrypted"
|
|
resources {
|
|
requests = {
|
|
storage = "10Gi"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
# --- Deployment ---
|
|
|
|
resource "kubernetes_deployment" "claude_agent" {
|
|
metadata {
|
|
name = "claude-agent-service"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
labels = local.labels
|
|
}
|
|
|
|
spec {
|
|
replicas = 1
|
|
strategy {
|
|
type = "Recreate"
|
|
}
|
|
|
|
selector {
|
|
match_labels = local.labels
|
|
}
|
|
|
|
template {
|
|
metadata {
|
|
labels = local.labels
|
|
}
|
|
|
|
spec {
|
|
service_account_name = kubernetes_service_account.claude_agent.metadata[0].name
|
|
|
|
image_pull_secrets {
|
|
name = "registry-credentials"
|
|
}
|
|
|
|
security_context {
|
|
run_as_user = 1000
|
|
run_as_group = 1000
|
|
fs_group = 1000
|
|
}
|
|
|
|
# Fix workspace ownership (PVC may have root-owned files from prior run)
|
|
init_container {
|
|
name = "fix-perms"
|
|
image = "busybox:1.37"
|
|
command = ["sh", "-c", "chown -R 1000:1000 /workspace"]
|
|
security_context {
|
|
run_as_user = 0
|
|
}
|
|
volume_mount {
|
|
name = "workspace"
|
|
mount_path = "/workspace"
|
|
}
|
|
resources {
|
|
requests = {
|
|
memory = "32Mi"
|
|
}
|
|
limits = {
|
|
memory = "64Mi"
|
|
}
|
|
}
|
|
}
|
|
|
|
# Copy Claude credentials to writable volume (CLI needs to refresh OAuth tokens)
|
|
init_container {
|
|
name = "copy-claude-creds"
|
|
image = "busybox:1.37"
|
|
command = ["sh", "-c", "cp /secrets/claude/.credentials.json /home/agent/.claude/.credentials.json && chown 1000:1000 /home/agent/.claude/.credentials.json"]
|
|
security_context {
|
|
run_as_user = 0
|
|
}
|
|
volume_mount {
|
|
name = "claude-credentials-secret"
|
|
mount_path = "/secrets/claude"
|
|
}
|
|
volume_mount {
|
|
name = "claude-home"
|
|
mount_path = "/home/agent/.claude"
|
|
}
|
|
resources {
|
|
requests = {
|
|
memory = "32Mi"
|
|
}
|
|
limits = {
|
|
memory = "64Mi"
|
|
}
|
|
}
|
|
}
|
|
|
|
# Init: clone repo + unlock git-crypt on first run
|
|
init_container {
|
|
name = "git-init"
|
|
image = "${local.image}:${local.image_tag}"
|
|
command = ["sh", "-c", <<-EOF
|
|
set -e
|
|
|
|
# Configure git with HTTPS + PAT
|
|
git config --global user.name "Claude Agent Service"
|
|
git config --global user.email "claude-agent@viktorbarzin.me"
|
|
git config --global --add safe.directory /workspace/infra
|
|
git config --global url."https://$${GITHUB_TOKEN}@github.com/".insteadOf "git@github.com:"
|
|
git config --global url."https://$${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
|
|
|
|
# Clone or update repo
|
|
if [ ! -d /workspace/infra/.git ]; then
|
|
git clone https://$${GITHUB_TOKEN}@github.com/ViktorBarzin/infra.git /workspace/infra
|
|
else
|
|
cd /workspace/infra
|
|
git fetch origin
|
|
git reset --hard origin/master
|
|
fi
|
|
|
|
# Unlock git-crypt
|
|
cd /workspace/infra
|
|
git-crypt unlock /secrets/git-crypt/key || true
|
|
EOF
|
|
]
|
|
|
|
env_from {
|
|
secret_ref {
|
|
name = "claude-agent-secrets"
|
|
}
|
|
}
|
|
|
|
volume_mount {
|
|
name = "workspace"
|
|
mount_path = "/workspace"
|
|
}
|
|
volume_mount {
|
|
name = "git-crypt-key"
|
|
mount_path = "/secrets/git-crypt"
|
|
}
|
|
|
|
resources {
|
|
requests = {
|
|
cpu = "100m"
|
|
memory = "256Mi"
|
|
}
|
|
limits = {
|
|
memory = "512Mi"
|
|
}
|
|
}
|
|
}
|
|
|
|
container {
|
|
name = "claude-agent-service"
|
|
image = "${local.image}:${local.image_tag}"
|
|
|
|
port {
|
|
container_port = 8080
|
|
}
|
|
|
|
env_from {
|
|
secret_ref {
|
|
name = "claude-agent-secrets"
|
|
}
|
|
}
|
|
|
|
env {
|
|
name = "WORKSPACE_DIR"
|
|
value = "/workspace/infra"
|
|
}
|
|
|
|
liveness_probe {
|
|
http_get {
|
|
path = "/health"
|
|
port = 8080
|
|
}
|
|
initial_delay_seconds = 10
|
|
period_seconds = 30
|
|
}
|
|
|
|
readiness_probe {
|
|
http_get {
|
|
path = "/health"
|
|
port = 8080
|
|
}
|
|
initial_delay_seconds = 5
|
|
period_seconds = 10
|
|
}
|
|
|
|
volume_mount {
|
|
name = "workspace"
|
|
mount_path = "/workspace"
|
|
}
|
|
volume_mount {
|
|
name = "sops-age-key"
|
|
mount_path = "/home/agent/.config/sops/age"
|
|
}
|
|
volume_mount {
|
|
name = "claude-home"
|
|
mount_path = "/home/agent/.claude"
|
|
}
|
|
|
|
resources {
|
|
requests = {
|
|
cpu = "500m"
|
|
memory = "2Gi"
|
|
}
|
|
limits = {
|
|
memory = "4Gi"
|
|
}
|
|
}
|
|
}
|
|
|
|
volume {
|
|
name = "workspace"
|
|
persistent_volume_claim {
|
|
claim_name = kubernetes_persistent_volume_claim.workspace.metadata[0].name
|
|
}
|
|
}
|
|
|
|
volume {
|
|
name = "sops-age-key"
|
|
secret {
|
|
secret_name = kubernetes_secret.sops_age_key.metadata[0].name
|
|
default_mode = "0600"
|
|
}
|
|
}
|
|
|
|
volume {
|
|
name = "git-crypt-key"
|
|
config_map {
|
|
name = kubernetes_config_map.git_crypt_key.metadata[0].name
|
|
}
|
|
}
|
|
|
|
volume {
|
|
name = "claude-credentials-secret"
|
|
secret {
|
|
secret_name = kubernetes_secret.claude_credentials.metadata[0].name
|
|
default_mode = "0600"
|
|
}
|
|
}
|
|
|
|
volume {
|
|
name = "claude-home"
|
|
empty_dir {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
lifecycle {
|
|
ignore_changes = [spec[0].template[0].spec[0].dns_config]
|
|
}
|
|
}
|
|
|
|
# --- Service ---
|
|
|
|
resource "kubernetes_service" "claude_agent" {
|
|
metadata {
|
|
name = "claude-agent-service"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
labels = local.labels
|
|
}
|
|
|
|
spec {
|
|
selector = local.labels
|
|
|
|
port {
|
|
port = 8080
|
|
target_port = 8080
|
|
}
|
|
|
|
type = "ClusterIP"
|
|
}
|
|
}
|
|
|
|
# =============================================================================
|
|
# Token expiry monitor
|
|
# Long-lived CLAUDE_CODE_OAUTH_TOKEN values expire 1y after mint. We track
|
|
# mint timestamps here — on rotation, update the map below. A CronJob pushes
|
|
# the computed expiry_timestamp to Pushgateway, Prometheus alerts 30d out.
|
|
# =============================================================================
|
|
locals {
|
|
claude_oauth_token_mint_epochs = {
|
|
# unix seconds (UTC) — when `claude setup-token` finished minting
|
|
"primary" = 1776528429 # 2026-04-18T12:07:09Z (TOKEN2)
|
|
"spare-1" = 1776528280 # 2026-04-18T12:04:40Z (TOKEN1)
|
|
"spare-2" = 1776528429 # 2026-04-18T12:07:09Z (TOKEN2 — redundant w/ primary)
|
|
}
|
|
claude_oauth_token_ttl_seconds = 365 * 24 * 60 * 60
|
|
}
|
|
|
|
resource "kubernetes_config_map" "claude_oauth_expiry" {
|
|
metadata {
|
|
name = "claude-oauth-expiry"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
data = {
|
|
for path, mint in local.claude_oauth_token_mint_epochs :
|
|
path => tostring(mint + local.claude_oauth_token_ttl_seconds)
|
|
}
|
|
}
|
|
|
|
resource "kubernetes_cron_job_v1" "claude_oauth_expiry_monitor" {
|
|
metadata {
|
|
name = "claude-oauth-expiry-monitor"
|
|
namespace = kubernetes_namespace.claude_agent.metadata[0].name
|
|
}
|
|
spec {
|
|
concurrency_policy = "Replace"
|
|
failed_jobs_history_limit = 3
|
|
successful_jobs_history_limit = 1
|
|
schedule = "17 */6 * * *" # every 6h at :17 past
|
|
job_template {
|
|
metadata {}
|
|
spec {
|
|
backoff_limit = 1
|
|
ttl_seconds_after_finished = 300
|
|
template {
|
|
metadata {}
|
|
spec {
|
|
restart_policy = "OnFailure"
|
|
container {
|
|
name = "push-expiry"
|
|
image = "docker.io/curlimages/curl:8.11.0"
|
|
command = ["/bin/sh", "-c", <<-EOT
|
|
set -e
|
|
PG='http://prometheus-prometheus-pushgateway.monitoring:9091/metrics/job/claude-oauth-expiry-monitor'
|
|
NOW=$(date +%s)
|
|
PAYLOAD=''
|
|
PAYLOAD="$${PAYLOAD}# HELP claude_oauth_token_expiry_timestamp Unix epoch when the CLAUDE_CODE_OAUTH_TOKEN for this path expires
|
|
"
|
|
PAYLOAD="$${PAYLOAD}# TYPE claude_oauth_token_expiry_timestamp gauge
|
|
"
|
|
for path in /mnt/expiry/*; do
|
|
name=$(basename "$path")
|
|
exp=$(cat "$path")
|
|
PAYLOAD="$${PAYLOAD}claude_oauth_token_expiry_timestamp{path=\"$name\"} $exp
|
|
"
|
|
done
|
|
PAYLOAD="$${PAYLOAD}# HELP claude_oauth_expiry_monitor_last_push_timestamp Last time the expiry monitor pushed metrics
|
|
"
|
|
PAYLOAD="$${PAYLOAD}# TYPE claude_oauth_expiry_monitor_last_push_timestamp gauge
|
|
"
|
|
PAYLOAD="$${PAYLOAD}claude_oauth_expiry_monitor_last_push_timestamp $NOW
|
|
"
|
|
echo "$PAYLOAD"
|
|
echo "$PAYLOAD" | curl -sS --data-binary @- "$PG"
|
|
echo "pushed at $NOW"
|
|
EOT
|
|
]
|
|
volume_mount {
|
|
name = "expiry"
|
|
mount_path = "/mnt/expiry"
|
|
}
|
|
resources {
|
|
requests = { cpu = "10m", memory = "32Mi" }
|
|
limits = { memory = "64Mi" }
|
|
}
|
|
}
|
|
volume {
|
|
name = "expiry"
|
|
config_map {
|
|
name = kubernetes_config_map.claude_oauth_expiry.metadata[0].name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|