feat: 打通 v0.1 runner job 正式路径

scripts/src/cli.ts

@@ -67,13 +67,27 @@ async function dispatch(args: ParsedArgs): Promise<JsonValue> {
 }
 
 async function renderRunnerJob(args: ParsedArgs): Promise<JsonRecord> {
-  if (args.flags.get("dry-run") !== true) throw new AgentRunError("schema-invalid", "runner job only supports --dry-run in v0.1", { httpStatus: 2 });
   const runId = flag(args, "run-id", "");
   const commandId = flag(args, "command-id", "");
-  const image = flag(args, "image", "");
   if (!runId) throw new AgentRunError("schema-invalid", "runner job requires --run-id", { httpStatus: 2 });
   if (!commandId) throw new AgentRunError("schema-invalid", "runner job requires --command-id", { httpStatus: 2 });
-  if (!image) throw new AgentRunError("schema-invalid", "runner job requires --image", { httpStatus: 2 });
+  const image = optionalFlag(args, "image");
+  if (args.flags.get("dry-run") !== true) {
+    const body: JsonRecord = { commandId };
+    if (image) body.image = image;
+    const namespace = optionalFlag(args, "namespace");
+    const attemptId = optionalFlag(args, "attempt-id");
+    const runnerId = optionalFlag(args, "runner-id");
+    const sourceCommit = optionalFlag(args, "source-commit");
+    const runnerManagerUrl = optionalFlag(args, "runner-manager-url");
+    if (namespace) body.namespace = namespace;
+    if (attemptId) body.attemptId = attemptId;
+    if (runnerId) body.runnerId = runnerId;
+    if (sourceCommit) body.sourceCommit = sourceCommit;
+    if (runnerManagerUrl) body.managerUrl = runnerManagerUrl;
+    return await client(args).post(`/api/v1/runs/${encodeURIComponent(runId)}/runner-jobs`, body) as JsonRecord;
+  }
+  if (!image) throw new AgentRunError("schema-invalid", "runner job --dry-run requires --image", { httpStatus: 2 });
   const run = await client(args).get(`/api/v1/runs/${encodeURIComponent(runId)}`) as RunRecord;
   const options = {
     run,
@@ -175,6 +189,7 @@ function help(): JsonRecord {
       "commands create <runId> --type turn --json-file <payload.json>",
       "commands show <commandId> --run-id <runId>",
       "runner start --run-id <runId>",
+      "runner job --run-id <runId> --command-id <commandId> [--image <image>] [--runner-manager-url <url>]",
       "runner job --dry-run --run-id <runId> --command-id <commandId> --image <image>",
       "secrets codex render --dry-run [--codex-home <dir>] [--namespace agentrun-v01] [--secret-name agentrun-v01-provider-codex]",
       "backends list",

scripts/src/gitops-render.ts

@@ -50,7 +50,7 @@ export async function renderGitops(options: RenderOptions): Promise<JsonRecord>
   await writeFile(path.join(options.outDir, "runtime-v01", "kustomization.yaml"), kustomizationYaml());
   await writeFile(path.join(options.outDir, "runtime-v01", "namespace.yaml"), namespaceYaml(runtimeNamespace));
   await writeFile(path.join(options.outDir, "runtime-v01", "postgres.yaml"), postgresYaml(runtimeNamespace));
-  await writeFile(path.join(options.outDir, "runtime-v01", "mgr.yaml"), managerYaml(runtimeNamespace, image));
+  await writeFile(path.join(options.outDir, "runtime-v01", "mgr.yaml"), managerYaml(runtimeNamespace, image, options.sourceCommit));
   await writeFile(path.join(options.outDir, "runtime-v01", "runner-rbac.yaml"), runnerRbacYaml(runtimeNamespace));
   return { outDir: options.outDir, runtimeNamespace, gitopsBranch, runtimePath, image: image.repositoryDigest, sourceCommit: options.sourceCommit };
 }
@@ -209,7 +209,7 @@ spec:
 `;
 }
 
-function managerYaml(namespace: string, image: { repositoryDigest: string }): string {
+function managerYaml(namespace: string, image: { repositoryDigest: string }, sourceCommit: string): string {
   return `apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -262,6 +262,16 @@ spec:
                 secretKeyRef:
                   name: agentrun-v01-mgr-db
                   key: DATABASE_URL
+            - name: AGENTRUN_SOURCE_COMMIT
+              value: ${JSON.stringify(sourceCommit)}
+            - name: AGENTRUN_RUNTIME_NAMESPACE
+              value: ${JSON.stringify(namespace)}
+            - name: AGENTRUN_INTERNAL_MGR_URL
+              value: ${JSON.stringify(`http://agentrun-mgr.${namespace}.svc.cluster.local:8080`)}
+            - name: AGENTRUN_RUNNER_IMAGE
+              value: ${JSON.stringify(image.repositoryDigest)}
+            - name: AGENTRUN_RUNNER_SERVICE_ACCOUNT
+              value: "agentrun-v01-runner"
           readinessProbe:
             httpGet:
               path: /health/readiness
@@ -277,6 +287,32 @@ spec:
             limits:
               cpu: 800m
               memory: 1Gi
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: agentrun-v01-mgr-runner-job-controller
+  namespace: ${namespace}
+rules:
+  - apiGroups: ["batch"]
+    resources: ["jobs"]
+    verbs: ["create", "get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: agentrun-v01-mgr-runner-job-controller
+  namespace: ${namespace}
+subjects:
+  - kind: ServiceAccount
+    name: agentrun-v01-mgr
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: agentrun-v01-mgr-runner-job-controller
 `;
 }