Skip to content

Agent Mesh

Merge branch 'main' into gotobeta

Antonio Ojea5f3f807ec863
diff --cc charts/sam-mesh/values.yaml
index 1699aea6,a78466cf..96386274
--- a/charts/sam-mesh/values.yaml
+++ b/charts/sam-mesh/values.yaml
@@@ -7,15 -7,11 +7,15 @@@ controlPlane
image:
repository: sam-control-plane
logLevel: info
- adminToken: super-secret-admin-token
+ # Leave empty to auto-generate a random admin token on first install (kept
+ # stable across upgrades). Set explicitly (e.g. via --set) to pin a known value.
+ adminToken: ""
autoApproveEnrollment: true
- insecureSkipTlsVerify: true
+ # Only skips TLS verification for the OIDC issuer; leave false unless
+ # pointing at a local/dev issuer without a valid certificate.
+ insecureSkipTlsVerify: false
oidcIssuer: "http://sam-mesh-dex:5556/dex"
- allowedAudiences: "sam-mesh-audience,sam-hub-audience"
+ allowedAudiences: "sam-mesh-audience,sam-control-plane-audience"
resources:
requests:
cpu: 100m
diff --cc tests/e2e/lib/container_mesh.bash
index 08f7aa01,8e7fad6c..ca912dee
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@@ -276,9 -276,8 +276,9 @@@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]
--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.adminToken="super-secret-admin-token" \
--set controlPlane.replicaCount=2 \
--set controlPlane.hostPort=8080 \
--set router.useOidcToken=false \