Merge pull request '按 guest Agent 格式恢复 SPIRE 父身份' (#26) from fix/opensandbox-guest-parent into main
test / python (push) Successful in 21s
test / shell (push) Successful in 26s
publish images / publish-images (push) Canceled after 0s

This commit was merged in pull request #26.
This commit is contained in:
2026-09-18 18:56:50 +00:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ Lifecycle 请求把稳定的 repository/task SPIFFE ID 放入 task environment
集群内的 `opensandbox-identity` controller 读取 BatchSandbox allocation 得到实际 集群内的 `opensandbox-identity` controller 读取 BatchSandbox allocation 得到实际
Pod UID,然后创建: Pod UID,然后创建:
- parent:`spiffe://ddupan.top/spire/agent/k8s_psat/sandbox-kata/<pod-uid>`; - parent:`spiffe://ddupan.top/spire/agent/k8s_psat/sandbox-kata/pod/<pod-uid>`;
- workload:`spiffe://ddupan.top/ci/<owner>/<repository>/<task>`; - workload:`spiffe://ddupan.top/ci/<owner>/<repository>/<task>`;
- selector:`unix:uid:2000`。 - selector:`unix:uid:2000`。
@@ -91,7 +91,7 @@ def identity_entry(
"className": SPIRE_CLASS_NAME, "className": SPIRE_CLASS_NAME,
"parentID": ( "parentID": (
f"spiffe://{SPIFFE_TRUST_DOMAIN}/spire/agent/k8s_psat/" f"spiffe://{SPIFFE_TRUST_DOMAIN}/spire/agent/k8s_psat/"
f"{SPIRE_CLUSTER_NAME}/{pod_uid}" f"{SPIRE_CLUSTER_NAME}/pod/{pod_uid}"
), ),
"spiffeID": spiffe_id, "spiffeID": spiffe_id,
"selectors": [f"unix:uid:{RUNNER_UID}"], "selectors": [f"unix:uid:{RUNNER_UID}"],
+1 -1
View File
@@ -49,5 +49,5 @@ def test_entry_binds_exact_pod_agent_and_runner_uid():
pod_uid="pod-uid", pod_uid="pod-uid",
spiffe_id="spiffe://ddupan.top/ci/org/repo/test", spiffe_id="spiffe://ddupan.top/ci/org/repo/test",
) )
assert entry["spec"]["parentID"].endswith("/sandbox-kata/pod-uid") assert entry["spec"]["parentID"].endswith("/sandbox-kata/pod/pod-uid")
assert entry["spec"]["selectors"] == ["unix:uid:2000"] assert entry["spec"]["selectors"] == ["unix:uid:2000"]