Skip to content

Commit 5bf56a7

Browse files
committed
Update agentgateway so the boot egress test runs on both dataplanes
Pin agentgateway v0.0.0-alpha.9d36620d, which admits egress from RESUMING actors (agentgateway#3882), to its multi-platform digest, and drop the agentgateway skip from TestGoldenBootEgress. Signed-off-by: QuentinBisson <quentin@giantswarm.io>
1 parent 463f43f commit 5bf56a7

3 files changed

Lines changed: 2 additions & 11 deletions

File tree

‎internal/e2e/atenet_dataplane.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ type AtenetDataplane interface {
3737
IsEgressPolicyDenied(status int, body string) bool
3838
PlatformMetricPrefixes([]string) []string
3939
RouteDurationSeen(context.Context, string) (bool, error)
40-
SupportsEgressWhileResuming() bool
4140
ScrapeMetrics(context.Context) (string, error)
4241
EgressConnectStats(before, after string) EgressConnectStats
4342
}
@@ -82,8 +81,6 @@ func (envoyAtenetDataplane) IsEgressPolicyDenied(status int, body string) bool {
8281
(status == http.StatusBadGateway && strings.Contains(body, "request failed"))
8382
}
8483

85-
func (envoyAtenetDataplane) SupportsEgressWhileResuming() bool { return true }
86-
8784
func (envoyAtenetDataplane) PlatformMetricPrefixes(prefixes []string) []string { return prefixes }
8885

8986
func (envoyAtenetDataplane) RouteDurationSeen(_ context.Context, collectorScrape string) (bool, error) {
@@ -148,9 +145,6 @@ func (agentGatewayAtenetDataplane) IsEgressPolicyDenied(status int, body string)
148145
return status == http.StatusForbidden && strings.Contains(body, "actor egress policy denied")
149146
}
150147

151-
// AgentGateway's substrate egress actor resolution admits RUNNING actors only.
152-
func (agentGatewayAtenetDataplane) SupportsEgressWhileResuming() bool { return false }
153-
154148
func (agentGatewayAtenetDataplane) PlatformMetricPrefixes(prefixes []string) []string {
155149
filtered := make([]string, 0, len(prefixes))
156150
for _, prefix := range prefixes {

‎internal/e2e/suites/egressmitm/goldenboot_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ var bootFetchManifests = e2e.SubstrateFixtureManifests{
3535
//
3636
// hack/run-e2e-kind.sh ./internal/e2e/suites/egressmitm -run TestGoldenBootEgress -v -args --no-color
3737
func TestGoldenBootEgress(t *testing.T) {
38-
if !e2e.CurrentAtenetDataplane().SupportsEgressWhileResuming() {
39-
t.Skip("the agentgateway dataplane admits egress from RUNNING actors only")
40-
}
4138
env, err := e2e.CheckEnv("BUCKET_NAME", "KO_DOCKER_REPO")
4239
if err != nil {
4340
t.Fatalf("CheckEnv failed: %v", err)

‎manifests/ate-install/components/agentgateway/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ patches:
4242
path: /spec/template/spec/containers/0
4343
value:
4444
name: agentgateway
45-
image: cr.agentgateway.dev/agentgateway:v0.0.0-alpha.168b05d6@sha256:5e8384d1fcfdc443a3ad5155ea6a64dc7953bde162df7f5f8e131a5c19ae08a3
45+
image: cr.agentgateway.dev/agentgateway:v0.0.0-alpha.9d36620d@sha256:bcfa0e5bfa8a4e8206ec4d2029f6b33a3599e55a9be81e1584ed4586298db3da
4646
args:
4747
- -f
4848
- /etc/agentgateway/config.yaml
@@ -118,7 +118,7 @@ patches:
118118
path: /spec/template/spec/containers/0
119119
value:
120120
name: agentgateway
121-
image: cr.agentgateway.dev/agentgateway:v0.0.0-alpha.168b05d6@sha256:5e8384d1fcfdc443a3ad5155ea6a64dc7953bde162df7f5f8e131a5c19ae08a3
121+
image: cr.agentgateway.dev/agentgateway:v0.0.0-alpha.9d36620d@sha256:bcfa0e5bfa8a4e8206ec4d2029f6b33a3599e55a9be81e1584ed4586298db3da
122122
args:
123123
- -f
124124
- /etc/agentgateway/config.yaml

0 commit comments

Comments
 (0)