Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
Rename sam-hub-audience to sam-control-plane-audience
Tomas Tormo946feb5f51b5
diff --git a/.github/k8s/sam-box-canary-template.yaml b/.github/k8s/sam-box-canary-template.yamlindex d95b43ba..1e587e2d 100644--- a/.github/k8s/sam-box-canary-template.yaml+++ b/.github/k8s/sam-box-canary-template.yaml@@ -93,4 +93,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-control-plane-template.yaml b/.github/k8s/sam-control-plane-template.yamlindex f7c3b621..77ff6331 100644--- a/.github/k8s/sam-control-plane-template.yaml+++ b/.github/k8s/sam-control-plane-template.yaml@@ -122,7 +122,7 @@ spec:- "--db-driver=postgres"- "--db-dsn=postgres://sam:sam-secret-password@sam-db-${ENV_NAME}:5432/sam_mesh?sslmode=disable"- "--issuer=https://auth.sam-mesh.dev,https://container.googleapis.com/v1/projects/${GCP_PROJECT_ID}/locations/${CLUSTER_REGION}/clusters/${CLUSTER_NAME}"- - "--allowed-audiences=sam-mesh-audience,sam-hub-audience"+ - "--allowed-audiences=sam-mesh-audience,sam-control-plane-audience"- "--admin-token=$(ADMIN_TOKEN)"- "--auto-approve-enrollment"- "--key-grace-period=48h"diff --git a/.github/k8s/sam-node-cop-template.yaml b/.github/k8s/sam-node-cop-template.yamlindex fce837c9..dbd95844 100644--- a/.github/k8s/sam-node-cop-template.yaml+++ b/.github/k8s/sam-node-cop-template.yaml@@ -92,4 +92,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-node-everything-template.yaml b/.github/k8s/sam-node-everything-template.yamlindex aeb621ee..63452337 100644--- a/.github/k8s/sam-node-everything-template.yaml+++ b/.github/k8s/sam-node-everything-template.yaml@@ -80,4 +80,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-node-openclaw-template.yaml b/.github/k8s/sam-node-openclaw-template.yamlindex dc37fa08..c14e5fc0 100644--- a/.github/k8s/sam-node-openclaw-template.yaml+++ b/.github/k8s/sam-node-openclaw-template.yaml@@ -141,4 +141,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-node-openrouter-template.yaml b/.github/k8s/sam-node-openrouter-template.yamlindex c29b1d9f..6036a878 100644--- a/.github/k8s/sam-node-openrouter-template.yaml+++ b/.github/k8s/sam-node-openrouter-template.yaml@@ -83,4 +83,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-node-template.yaml b/.github/k8s/sam-node-template.yamlindex b3228b78..0c88b077 100644--- a/.github/k8s/sam-node-template.yaml+++ b/.github/k8s/sam-node-template.yaml@@ -83,4 +83,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-node-vllm-template.yaml b/.github/k8s/sam-node-vllm-template.yamlindex f654b9ce..c6e7ff54 100644--- a/.github/k8s/sam-node-vllm-template.yaml+++ b/.github/k8s/sam-node-vllm-template.yaml@@ -136,4 +136,4 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"diff --git a/.github/k8s/sam-router-template.yaml b/.github/k8s/sam-router-template.yamlindex 980ab60c..5f56a4ce 100644--- a/.github/k8s/sam-router-template.yaml+++ b/.github/k8s/sam-router-template.yaml@@ -82,7 +82,7 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"volumeClaimTemplates:- metadata:name: router-datadiff --git a/charts/sam-mesh/templates/router-statefulset.yaml b/charts/sam-mesh/templates/router-statefulset.yamlindex e7c7f168..94def123 100644--- a/charts/sam-mesh/templates/router-statefulset.yaml+++ b/charts/sam-mesh/templates/router-statefulset.yaml@@ -113,6 +113,6 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"{{- end }}{{- end }}diff --git a/charts/sam-mesh/values.yaml b/charts/sam-mesh/values.yamlindex 2bdbed12..a78466cf 100644--- a/charts/sam-mesh/values.yaml+++ b/charts/sam-mesh/values.yaml@@ -11,7 +11,7 @@ controlPlane:autoApproveEnrollment: trueinsecureSkipTlsVerify: trueoidcIssuer: "http://sam-mesh-dex:5556/dex"- allowedAudiences: "sam-mesh-audience,sam-hub-audience"+ allowedAudiences: "sam-mesh-audience,sam-control-plane-audience"resources:requests:cpu: 100mdiff --git a/development/kind/run.sh b/development/kind/run.shindex d1779141..41d6e0d9 100755--- a/development/kind/run.sh+++ b/development/kind/run.sh@@ -144,7 +144,7 @@ if [[ -n "${OIDC_ISSUER}" ]]; thenCONTROL_PLANE_ISSUERS="${OIDC_ISSUER},${ISSUER}"fi-ALLOWED_AUDIENCES="sam-mesh-audience,sam-hub-audience"+ALLOWED_AUDIENCES="sam-mesh-audience,sam-control-plane-audience"if [[ -n "${OIDC_CLIENT_ID}" ]]; thenALLOWED_AUDIENCES="${OIDC_CLIENT_ID},${ALLOWED_AUDIENCES}"fidiff --git a/mobile/mobile_e2e.sh b/mobile/mobile_e2e.shindex 89bb0aee..1547508b 100755--- a/mobile/mobile_e2e.sh+++ b/mobile/mobile_e2e.sh@@ -78,7 +78,7 @@ docker run --name sam-control-plane \--db-driver sqlite \--db-dsn /data/control-plane.db \--issuer http://mock-oidc:18080 \- --allowed-audiences sam-mesh-audience,sam-hub-audience \+ --allowed-audiences sam-mesh-audience,sam-control-plane-audience \--admin-token secret-admin-token \--insecure-skip-tls-verify \--log-level debugdiff --git a/site/content/docs/development/kubernetes-deployment.md b/site/content/docs/development/kubernetes-deployment.mdindex 912d27f6..44a73486 100644--- a/site/content/docs/development/kubernetes-deployment.md+++ b/site/content/docs/development/kubernetes-deployment.md@@ -417,5 +417,5 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience" # Match this with what the control plane expects+ audience: "sam-control-plane-audience" # Match this with what the control plane expects```diff --git a/site/content/docs/manifests/sam-control-plane.yaml b/site/content/docs/manifests/sam-control-plane.yamlindex 8c2c260d..02a816e7 100644--- a/site/content/docs/manifests/sam-control-plane.yaml+++ b/site/content/docs/manifests/sam-control-plane.yaml@@ -45,7 +45,7 @@ spec:- "--db-driver=sqlite"- "--db-dsn=/data/control-plane.db"- "--issuer=$(SAM_OIDC_ISSUER)"- - "--allowed-audiences=sam-mesh-audience,sam-hub-audience"+ - "--allowed-audiences=sam-mesh-audience,sam-control-plane-audience"- "--policy-file=/etc/sam/policies/policies.yaml"- "--insecure-skip-tls-verify"ports:diff --git a/site/content/docs/manifests/sam-router.yaml b/site/content/docs/manifests/sam-router.yamlindex 569880f7..0d75b0ee 100644--- a/site/content/docs/manifests/sam-router.yaml+++ b/site/content/docs/manifests/sam-router.yaml@@ -65,7 +65,7 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"- name: router-dataemptyDir: {}---diff --git a/site/content/docs/user/kubernetes-deployment.md b/site/content/docs/user/kubernetes-deployment.mdindex 6d103051..4b616a1f 100644--- a/site/content/docs/user/kubernetes-deployment.md+++ b/site/content/docs/user/kubernetes-deployment.md@@ -216,7 +216,7 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"volumeClaimTemplates:- metadata:name: router-data@@ -280,7 +280,7 @@ data:```### 3. Deploy Nodes using Token Projection-Deploy the nodes. We use a `projected` volume to request a short-lived token containing the audience expected by the control plane (`sam-hub-audience`):+Deploy the nodes. We use a `projected` volume to request a short-lived token containing the audience expected by the control plane (`sam-control-plane-audience`):```yamlapiVersion: apps/v1@@ -318,7 +318,7 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience" # Match this with what the control plane expects+ audience: "sam-control-plane-audience" # Match this with what the control plane expects```---diff --git a/site/content/docs/user/secure-gateway.md b/site/content/docs/user/secure-gateway.mdindex 4055ec94..336bf229 100644--- a/site/content/docs/user/secure-gateway.md+++ b/site/content/docs/user/secure-gateway.md@@ -178,5 +178,5 @@ spec:- serviceAccountToken:path: sam-tokenexpirationSeconds: 3600- audience: "sam-hub-audience"+ audience: "sam-control-plane-audience"```diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bashindex 5be2464d..b2083c4e 100644--- a/tests/e2e/lib/container_mesh.bash+++ b/tests/e2e/lib/container_mesh.bash@@ -276,7 +276,7 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then--set fullnameOverride="sam" \--set global.imageTag="local" \--set controlPlane.oidcIssuer="${ISSUERS//,/\\,}" \- --set controlPlane.allowedAudiences="sam-mesh-audience\,sam-hub-audience" \+ --set controlPlane.allowedAudiences="sam-mesh-audience\,sam-control-plane-audience" \--set controlPlane.insecureSkipTlsVerify=true \--set controlPlane.replicaCount=2 \--set controlPlane.hostPort=8080 \