Skip to content

Agent Mesh

test(e2e): migrate E2E tests to deploy via Helm chart and remove obsolete fixtures

Antonio Ojeade76a0b634fe
diff --git a/charts/sam-mesh/templates/bootstrap-job.yaml b/charts/sam-mesh/templates/bootstrap-job.yaml
index d1f9ebd3..f7082a9d 100644
--- a/charts/sam-mesh/templates/bootstrap-job.yaml
+++ b/charts/sam-mesh/templates/bootstrap-job.yaml
@@ -82,6 +82,7 @@ spec:
(dict "role" "sam:role:router" "members" (list "group:routers" $defaultRouterSA))
(dict "role" "sam-admin" "members" (list (printf "user:system:serviceaccount:%s:node-a-sa" .Release.Namespace) (printf "user:system:serviceaccount:%s:node-b-sa" .Release.Namespace) (printf "user:system:serviceaccount:%s:node-c-sa" .Release.Namespace) (printf "user:system:serviceaccount:%s:local-node-sa" .Release.Namespace)))
(dict "role" "sam:role:sambox" "members" (list (printf "user:system:serviceaccount:%s:sam-box-sa" .Release.Namespace)))
+ (dict "role" "sam:role:node" "members" (list "group:data-scientist" "group:users"))
-}}
{{- end }}
curl -s -X POST \
@@ -91,7 +92,8 @@ spec:
"roles": [
{"name": "sam-admin", "allowed_services": ["*"], "allowed_targets": ["*"]},
{"name": "sam:role:sambox", "allowed_services": ["*"], "allowed_targets": ["*"]},
- {"name": "sam:role:router", "allowed_services": ["*"], "allowed_targets": ["*"]}
+ {"name": "sam:role:router", "allowed_services": ["*"], "allowed_targets": ["*"]},
+ {"name": "sam:role:node", "allowed_services": ["mcp://calculator", "mcp://db-agent", "mcp://http-tool", "mcp://stdio-tool", "system://sam.catalog"], "allowed_targets": ["*"]}
],
"bindings": {{ toJson $bindings }}
}' \
diff --git a/charts/sam-mesh/templates/control-plane-deployment.yaml b/charts/sam-mesh/templates/control-plane-deployment.yaml
index f97610b4..23c69208 100644
--- a/charts/sam-mesh/templates/control-plane-deployment.yaml
+++ b/charts/sam-mesh/templates/control-plane-deployment.yaml
@@ -39,6 +39,9 @@ spec:
ports:
- containerPort: 8080
name: http
+ {{- if .Values.controlPlane.hostPort }}
+ hostPort: {{ .Values.controlPlane.hostPort }}
+ {{- end }}
protocol: TCP
readinessProbe:
httpGet:
diff --git a/charts/sam-mesh/templates/router-statefulset.yaml b/charts/sam-mesh/templates/router-statefulset.yaml
index cef28bf6..94c675c8 100644
--- a/charts/sam-mesh/templates/router-statefulset.yaml
+++ b/charts/sam-mesh/templates/router-statefulset.yaml
@@ -31,9 +31,15 @@ spec:
ports:
- containerPort: 4501
name: p2p-tcp
+ {{- if .Values.router.hostPort }}
+ hostPort: {{ .Values.router.hostPort }}
+ {{- end }}
protocol: TCP
- containerPort: 4501
name: p2p-udp
+ {{- if .Values.router.hostPort }}
+ hostPort: {{ .Values.router.hostPort }}
+ {{- end }}
protocol: UDP
env:
{{- if not .Values.router.useOidcToken }}
diff --git a/tests/e2e/fixtures/control-plane.yaml b/tests/e2e/fixtures/control-plane.yaml
deleted file mode 100644
index 682a8517..00000000
--- a/tests/e2e/fixtures/control-plane.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: sam-hub-config
-data:
- SAM_OIDC_ISSUER: "${ISSUERS}"
- SAM_OIDC_ID: "sam-mesh-audience"
- policy.yaml: |
- version: v1alpha1
- bindings:
- - members: ["user:system:serviceaccount:default:sam-node-sa"]
- role: admin
- - members: ["group:data-scientist"]
- role: mesh-member
- - members: ["group:admin"]
- role: admin
- - members: ["user:admin-user"]
- role: admin
- - members: ["group:routers"]
- role: "sam:role:router"
- roles:
- admin:
- allowed_services:
- - "*"
- allowed_targets:
- - "*"
- mesh-member:
- allowed_services:
- - "mcp://calculator"
- - "mcp://db-agent"
- - "mcp://http-tool"
- - "mcp://stdio-tool"
- - "system://sam.catalog"
- allowed_targets:
- - "*"
- "sam:role:router":
- allowed_services:
- - "*"
- allowed_targets:
- - "*"
----
-apiVersion: v1
-kind: Service
-metadata:
- name: sam-db
-spec:
- ports:
- - name: postgres
- port: 5432
- targetPort: 5432
- selector:
- app: sam-db
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: sam-db
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: sam-db
- template:
- metadata:
- labels:
- app: sam-db
- spec:
- containers:
- - name: postgres
- image: postgres:16-alpine
- env:
- - name: POSTGRES_DB
- value: sam_mesh
- - name: POSTGRES_USER
- value: sam
- - name: POSTGRES_PASSWORD
- value: sam-secret-password
- ports:
- - containerPort: 5432
- protocol: TCP
----
-apiVersion: v1
-kind: Service
-metadata:
- name: sam-control-plane
-spec:
- ports:
- - name: http
- port: 8080
- targetPort: 8080
- selector:
- app: sam-control-plane
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: sam-control-plane
-spec:
- replicas: 2
- strategy:
- type: Recreate
- selector:
- matchLabels:
- app: sam-control-plane
- template:
- metadata:
- labels:
- app: sam-control-plane
- spec:
- affinity:
- podAntiAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- - labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - sam-control-plane
- topologyKey: "kubernetes.io/hostname"
- initContainers:
- - name: wait-for-db
- image: busybox:latest
- command: ['sh', '-c', 'until nc -z -w3 sam-db 5432; do echo waiting for db; sleep 1; done']
- containers:
- - name: sam-control-plane
- image: sam-control-plane:local
- ports:
- - containerPort: 8080
- hostPort: 8080
- protocol: TCP
- args:
- - "--bind-address=0.0.0.0:8080"
- - "--db-driver=postgres"
- - "--db-dsn=postgres://sam:sam-secret-password@sam-db:5432/sam_mesh?sslmode=disable"
- - "--issuer=${ISSUERS}"
- - "--allowed-audiences=sam-mesh-audience,sam-hub-audience"
- - "--policy-file=/etc/sam/policy.yaml"
- - "--insecure-skip-tls-verify"
- - "--lease-duration=15s"
- - "--admin-token=super-secret-admin-token"
- - "--auto-approve-enrollment"
- - "--log-level=debug"
- volumeMounts:
- - name: config-volume
- mountPath: /etc/sam/policy.yaml
- subPath: policy.yaml
- volumes:
- - name: config-volume
- configMap:
- name: sam-hub-config
diff --git a/tests/e2e/fixtures/router.yaml b/tests/e2e/fixtures/router.yaml
deleted file mode 100644
index af267739..00000000
--- a/tests/e2e/fixtures/router.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: sam-router
-spec:
- clusterIP: None
- ports:
- - port: 4501
- targetPort: 4501
- protocol: TCP
- name: p2p-tcp
- - port: 4501
- targetPort: 4501
- protocol: UDP
- name: p2p-udp
- selector:
- app: sam-router
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: sam-router
-spec:
- serviceName: "sam-router"
- replicas: 1
- selector:
- matchLabels:
- app: sam-router
- template:
- metadata:
- labels:
- app: sam-router
- spec:
- containers:
- - name: sam-router
- image: sam-router:local
- ports:
- - containerPort: 4501
- hostPort: 4501
- protocol: TCP
- - containerPort: 4501
- hostPort: 4501
- protocol: UDP
- env:
- - name: ROUTER_NODE_IP
- valueFrom:
- fieldRef:
- fieldPath: status.hostIP
- args:
- - "--control-plane=http://sam-control-plane:8080"
- - "--listen=/ip4/0.0.0.0/tcp/4501"
- - "--listen=/ip4/0.0.0.0/udp/4501/quic-v1"
- - "--external-addr=/dns4/sam-router/tcp/4501"
- - "--external-addr=/dns4/sam-router/udp/4501/quic-v1"
- - "--external-addr=/ip4/$(ROUTER_NODE_IP)/tcp/4501"
- - "--external-addr=/ip4/$(ROUTER_NODE_IP)/udp/4501/quic-v1"
- - "--bootstrap-token-path=/var/run/secrets/tokens/sa-token"
- - "--keys-path=/data/router.key"
- - "--allow-loopback"
- - "--lease-renew-interval=5s"
- - "--log-level=debug"
- - "--dht-provider-addr-ttl=5s"
- - "--dht-max-record-age=5s"
- volumeMounts:
- - name: router-data
- mountPath: /data
- - name: router-token-vol
- mountPath: /var/run/secrets/tokens
- readOnly: true
- volumes:
- - name: router-data
- emptyDir: {}
- - name: router-token-vol
- secret:
- secretName: sam-router-token
- items:
- - key: token
- path: sa-token
diff --git a/tests/e2e/fixtures/sam-node.yaml b/tests/e2e/fixtures/sam-node.yaml
deleted file mode 100644
index aa201efe..00000000
--- a/tests/e2e/fixtures/sam-node.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: sam-node
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: sam-node
- template:
- metadata:
- labels:
- app: sam-node
- spec:
- serviceAccountName: sam-node-sa
- containers:
- - name: sam-node
- image: sam-node:local
- command: ["/sam-node", "run"]
- args:
- - "--hub"
- - "http://sam-control-plane.default.svc.cluster.local:8080"
- - "--jwt-path"
- - "/var/run/secrets/tokens/sam-token"
- - "--api-token"
- - "secret-token"
- - "--allow-loopback"
- volumeMounts:
- - name: sam-token
- mountPath: /var/run/secrets/tokens
- readOnly: true
- volumes:
- - name: sam-token
- projected:
- sources:
- - serviceAccountToken:
- path: sam-token
- expirationSeconds: 3600
- audience: "sam-mesh-audience"
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index 4dea5b4e..8b1ca4a9 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -261,86 +261,30 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
local oidc_node_ip
oidc_node_ip=$(docker inspect -f "{{(index .NetworkSettings.Networks \"${MESH_NETWORK:-kind}\").IPAddress}}" "${oidc_node}")
- envsubst '$ISSUERS' < tests/e2e/fixtures/control-plane.yaml | kubectl --context="${KUBECONTEXT}" apply -f -
- kubectl --context="${KUBECONTEXT}" rollout status deployment/sam-db --timeout=60s
- kubectl --context="${KUBECONTEXT}" rollout status deployment/sam-control-plane --timeout=60s
-
- local policy_json='{
- "roles": [
- {
- "name": "sam:role:node",
- "allowed_services": [
- "mcp://calculator",
- "mcp://db-agent",
- "mcp://http-tool",
- "mcp://stdio-tool",
- "system://sam.catalog"
- ],
- "allowed_targets": ["*"]
- },
- {
- "name": "sam:role:router",
- "allowed_services": ["*"],
- "allowed_targets": ["*"]
- }
- ],
- "bindings": [
- {
- "role": "sam:role:node",
- "members": ["group:data-scientist", "group:users"]
- },
- {
- "role": "sam:role:router",
- "members": ["group:routers"]
- }
- ]
- }'
-
- kubectl --context="${KUBECONTEXT}" run seed-policy \
- --image=curlimages/curl:8.6.0 \
- --restart=Never \
- --overrides="{\"spec\": {\"activeDeadlineSeconds\": 30}}" \
- -- \
- curl -s -X POST \
- -H "Content-Type: application/json" \
- -H "Authorization: Bearer super-secret-admin-token" \
- -d "${policy_json}" \
- http://sam-control-plane:8080/policies
-
- kubectl --context="${KUBECONTEXT}" wait --for=jsonpath='{.status.phase}'=Succeeded pod/seed-policy --timeout=15s
- kubectl --context="${KUBECONTEXT}" delete pod seed-policy --ignore-not-found
-
- # Create curl pod in background to request token
- kubectl --context="${KUBECONTEXT}" run curl-token-gen \
- --image=curlimages/curl:8.6.0 \
- --restart=Never \
- --overrides='{"spec": {"activeDeadlineSeconds": 30}}' \
- -- \
- curl -s -X POST \
- -H "Content-Type: application/json" \
- -H "Authorization: Bearer super-secret-admin-token" \
- -d '{"role": "sam:role:router", "max_usages": 999999}' \
- http://sam-control-plane:8080/admin/bootstrap-tokens
-
- if ! kubectl --context="${KUBECONTEXT}" wait --for=jsonpath='{.status.phase}'=Succeeded pod/curl-token-gen --timeout=15s; then
- echo "ERROR: Token generation pod failed! Diagnostics:"
- kubectl --context="${KUBECONTEXT}" describe pod curl-token-gen || true
- kubectl --context="${KUBECONTEXT}" logs pod/curl-token-gen || true
- kubectl --context="${KUBECONTEXT}" delete pod curl-token-gen --ignore-not-found || true
- exit 1
+ local helm_bin="helm"
+ if ! command -v helm >/dev/null 2>&1; then
+ if [[ -x "./bin/helm" ]]; then
+ helm_bin="./bin/helm"
+ else
+ echo "helm CLI not found; please install helm or place it in ./bin/helm" >&2
+ return 1
+ fi
fi
- local token_json
- token_json=$(kubectl --context="${KUBECONTEXT}" logs pod/curl-token-gen)
- kubectl --context="${KUBECONTEXT}" delete pod curl-token-gen --ignore-not-found
-
- local router_token
- router_token=$(echo "${token_json}" | jq -r .token)
- [[ -n "${router_token}" && "${router_token}" != "null" ]]
-
- kubectl --context="${KUBECONTEXT}" create secret generic sam-router-token --from-literal=token="${router_token}" --dry-run=client -o yaml | kubectl --context="${KUBECONTEXT}" apply -f -
-
- kubectl --context="${KUBECONTEXT}" apply -f tests/e2e/fixtures/router.yaml
+ "${helm_bin}" --kube-context="${KUBECONTEXT}" upgrade --install sam ./charts/sam-mesh \
+ --namespace default \
+ --set fullnameOverride="sam" \
+ --set global.imageTag="local" \
+ --set controlPlane.oidcIssuer="${ISSUERS//,/\\,}" \
+ --set controlPlane.allowedAudiences="sam-mesh-audience\,sam-hub-audience" \
+ --set controlPlane.replicaCount=2 \
+ --set controlPlane.hostPort=8080 \
+ --set router.useOidcToken=false \
+ --set router.hostPort=4501
+
+ kubectl --context="${KUBECONTEXT}" rollout status statefulset/sam-db --timeout=60s
+ kubectl --context="${KUBECONTEXT}" rollout status deployment/sam-control-plane --timeout=60s
+ kubectl --context="${KUBECONTEXT}" wait --for=condition=complete --timeout=60s job/sam-bootstrap
kubectl --context="${KUBECONTEXT}" rollout status statefulset/sam-router --timeout=60s
local i