Skip to content

Commit 159ccb7

Browse files
committed
test(infra): port the billing usage collector into the env
CI now runs test/e2e (incl. test/e2e/billing) on the prod-fidelity env, but #239 wired the Vector collector into the retired bridge's prepare-infra-cluster. Install it from the env instead, and point its kubernetes_logs source at the env's Envoy namespace (datum-downstream-gateway, not the bridge's envoy-gateway-system). Also add workflow_dispatch to the e2e workflow so the run can be triggered directly instead of only via the gated pull_request event.
1 parent 14433d3 commit 159ccb7

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
branches:
99
- main
10+
workflow_dispatch:
1011

1112
jobs:
1213
test-e2e:

Taskfile.test-infra.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ tasks:
7474
- task: prepare-upstream
7575
- task: eg-downstream
7676
- task: extension-server
77+
- task: billing-usage-collector
7778
- task: external-dns
7879
- task: link-clusters
7980
- task: wait-ready
@@ -168,6 +169,12 @@ tasks:
168169
# be in the manifest, not added afterward.
169170
- kubectl --context {{.DOWNSTREAM_CTX}} apply -f config/e2e-downstream/direct-namespace.yaml
170171

172+
billing-usage-collector:
173+
desc: "Install the billing usage collector (Vector agent) that tails the downstream Envoy access logs and emits usage CloudEvents."
174+
cmds:
175+
- echo "🔧 installing billing-usage-collector (Vector agent, tailing datum-downstream-gateway)"
176+
- '{{.KUSTOMIZE}} build --enable-helm config/tools/billing-usage-collector | kubectl --context {{.DOWNSTREAM_CTX}} apply --server-side=true --force-conflicts -f -'
177+
171178
eg-downstream:
172179
desc: "Install the dedicated downstream Envoy Gateway (v1.7.4) with the ext-server extensionManager wiring on the downstream cluster."
173180
cmds:

config/tools/billing-usage-collector/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ helmCharts:
5050
# Only tail the Envoy proxy pods; their access logs live on the
5151
# `envoy` container's stdout. Other namespaces/containers are
5252
# ignored so the agent does not parse unrelated cluster logs.
53-
extra_field_selector: "metadata.namespace=envoy-gateway-system"
53+
extra_field_selector: "metadata.namespace=datum-downstream-gateway"
5454
# Re-scan for new container log files every 2s instead of the 60s
5555
# default so the agent picks up freshly-created Envoy proxy pods
5656
# quickly -- the e2e test provisions a gateway and verifies within a

0 commit comments

Comments
 (0)