Skip to content

e2e: reduce consistent hash flaky #8371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zirain merged 1 commit into from
Mar 9, 2026
Merged

e2e: reduce consistent hash flaky #8371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions internal/troubleshoot/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const (

type CollectOptions struct {
namespaces []string
selector []string
bundlePath string
// enableSDS indicates whether to remove the SDS section from the config dump
// to avoid collecting sensitive information.
Expand All @@ -52,6 +53,12 @@ func WithCollectedNamespaces(ns []string) CollectOption {
}
}

func WithSelector(selector ...string) CollectOption {
return func(opts *CollectOptions) {
opts.selector = selector
}
}

func DisableCollector(collector CollectorType) CollectOption {
return func(opts *CollectOptions) {
if opts.disabledCollectors == nil {
Expand Down Expand Up @@ -120,6 +127,7 @@ func CollectResult(ctx context.Context, restConfig *rest.Config, opts ...Collect
Collector: &troubleshootv1b2.Logs{
Name: "pod-logs",
Namespace: ns,
Selector: collectorOpts.selector,
},
ClientConfig: restConfig,
BundlePath: bundlePath,
Expand Down
102 changes: 3 additions & 99 deletions test/e2e/base/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,102 +273,6 @@ metadata:
gateway-conformance: backend
---
apiVersion: v1
kind: Service
metadata:
name: app-backend-v1
namespace: gateway-conformance-app-backend
spec:
selector:
app: app-backend-v1
ports:
- protocol: TCP
port: 8080
targetPort: 3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: app-backend-v1
namespace: gateway-conformance-app-backend
labels:
app: app-backend-v1
spec:
replicas: 2
selector:
matchLabels:
app: app-backend-v1
template:
metadata:
labels:
app: app-backend-v1
spec:
containers:
- name: app-backend-v1
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SERVICE_NAME
value: app-backend-v1
resources:
requests:
cpu: 10m
---
apiVersion: v1
kind: Service
metadata:
name: app-backend-v2
namespace: gateway-conformance-app-backend
spec:
selector:
app: app-backend-v2
ports:
- protocol: TCP
port: 8080
targetPort: 3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: app-backend-v2
namespace: gateway-conformance-app-backend
labels:
app: app-backend-v2
spec:
replicas: 2
selector:
matchLabels:
app: app-backend-v2
template:
metadata:
labels:
app: app-backend-v2
spec:
containers:
- name: app-backend-v2
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SERVICE_NAME
value: app-backend-v2
resources:
requests:
cpu: 10m
---
apiVersion: v1
kind: Namespace
metadata:
name: gateway-conformance-web-backend
Expand All @@ -379,7 +283,7 @@ apiVersion: v1
kind: Service
metadata:
name: web-backend
namespace: gateway-conformance-web-backend
namespace: gateway-conformance-infra
spec:
selector:
app: web-backend
Expand All @@ -392,11 +296,11 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: web-backend
namespace: gateway-conformance-web-backend
namespace: gateway-conformance-infra
labels:
app: web-backend
spec:
replicas: 2
replicas: 4
selector:
matchLabels:
app: web-backend
Expand Down
1 change: 0 additions & 1 deletion test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ func TestE2E(t *testing.T) {

skipTests := []string{
tests.GatewayInfraResourceTest.ShortName, // https://github.com/envoyproxy/gateway/issues/3191
tests.ConsistentHashQueryParamsLoadBalancingTest.ShortName,
}

// Skip test only work on DualStack cluster
Expand Down
51 changes: 1 addition & 50 deletions test/e2e/testdata/load_balancing_consistent_hash_cookie.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,3 @@
apiVersion: v1
kind: Service
metadata:
name: lb-backend-cookie
namespace: gateway-conformance-infra
spec:
selector:
app: lb-backend-cookie
ports:
- protocol: TCP
port: 8080
targetPort: 3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: lb-backend-cookie
namespace: gateway-conformance-infra
labels:
app: lb-backend-cookie
spec:
replicas: 4
selector:
matchLabels:
app: lb-backend-cookie
template:
metadata:
labels:
app: lb-backend-cookie
spec:
containers:
- name: backend
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SERVICE_NAME
value: lb-backend-cookie
resources:
requests:
cpu: 10m
---
apiVersion: gateway.envoyproxy.io/v1alpha1
kind: BackendTrafficPolicy
metadata:
Expand Down Expand Up @@ -81,5 +32,5 @@ spec:
type: PathPrefix
value: /cookie
backendRefs:
- name: lb-backend-cookie
- name: web-backend
port: 8080
50 changes: 1 addition & 49 deletions test/e2e/testdata/load_balancing_consistent_hash_header.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
apiVersion: v1
kind: Service
metadata:
name: lb-backend-header
namespace: gateway-conformance-infra
spec:
selector:
app: lb-backend-header
ports:
- protocol: TCP
port: 8080
targetPort: 3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: lb-backend-header
namespace: gateway-conformance-infra
labels:
app: lb-backend-header
spec:
replicas: 4
selector:
matchLabels:
app: lb-backend-header
template:
metadata:
labels:
app: lb-backend-header
spec:
containers:
- name: backend
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SERVICE_NAME
value: lb-backend-header
resources:
requests:
cpu: 10m
---
apiVersion: gateway.envoyproxy.io/v1alpha1
kind: BackendTrafficPolicy
Expand Down Expand Up @@ -78,5 +30,5 @@ spec:
type: PathPrefix
value: /header
backendRefs:
- name: lb-backend-header
- name: web-backend
port: 8080
50 changes: 1 addition & 49 deletions test/e2e/testdata/load_balancing_consistent_hash_multi_header.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
apiVersion: v1
kind: Service
metadata:
name: lb-backend-header
namespace: gateway-conformance-infra
spec:
selector:
app: lb-backend-header
ports:
- protocol: TCP
port: 8080
targetPort: 3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: lb-backend-header
namespace: gateway-conformance-infra
labels:
app: lb-backend-header
spec:
replicas: 4
selector:
matchLabels:
app: lb-backend-header
template:
metadata:
labels:
app: lb-backend-header
spec:
containers:
- name: backend
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SERVICE_NAME
value: lb-backend-header
resources:
requests:
cpu: 10m
---
apiVersion: gateway.envoyproxy.io/v1alpha1
kind: BackendTrafficPolicy
Expand Down Expand Up @@ -79,5 +31,5 @@ spec:
type: PathPrefix
value: /header
backendRefs:
- name: lb-backend-header
- name: web-backend
port: 8080
50 changes: 1 addition & 49 deletions test/e2e/testdata/load_balancing_consistent_hash_query_parameter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
apiVersion: v1
kind: Service
metadata:
name: lb-backend-query-parameter
namespace: gateway-conformance-infra
spec:
selector:
app: lb-backend-query-parameter
ports:
- protocol: TCP
port: 8080
targetPort: 3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: lb-backend-query-parameter
namespace: gateway-conformance-infra
labels:
app: lb-backend-query-parameter
spec:
replicas: 4
selector:
matchLabels:
app: lb-backend-query-parameter
template:
metadata:
labels:
app: lb-backend-query-parameter
spec:
containers:
- name: backend
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20231214-v1.0.0-140-gf544a46e
imagePullPolicy: IfNotPresent
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: SERVICE_NAME
value: lb-backend-query-parameter
resources:
requests:
cpu: 10m
---
apiVersion: gateway.envoyproxy.io/v1alpha1
kind: BackendTrafficPolicy
Expand Down Expand Up @@ -79,5 +31,5 @@ spec:
type: PathPrefix
value: /query-parameter
backendRefs:
- name: lb-backend-query-parameter
- name: web-backend
port: 8080
Loading