Skip to content

Commit b974462

Browse files
committed
reverse incorrect merge during rebase
Signed-off-by: hai.yue <20416005+yuehaii@users.noreply.github.com>
1 parent 7cf2c55 commit b974462

2 files changed

Lines changed: 1 addition & 31 deletions

File tree

api/v1alpha1/validation/envoygateway_validate_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,6 @@ func TestGetExtensionManagers(t *testing.T) {
13631363
assert.Equal(t, "plural2", result[1].Name)
13641364
})
13651365
}
1366-
<<<<<<< HEAD
13671366

13681367
func TestWarnEnvoyGateway(t *testing.T) {
13691368
eg := egv1a1.DefaultEnvoyGateway()
@@ -1462,6 +1461,4 @@ func TestLuaDisabled(t *testing.T) {
14621461
assert.Equal(t, tc.expected, tc.ext.LuaDisabled())
14631462
})
14641463
}
1465-
}
1466-
=======
1467-
>>>>>>> c68d38ca0 (feat(extensionManager): add support for multiple ExtensionManagers with sequential chaining (#8458))
1464+
}

internal/ir/xds.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,33 +2782,6 @@ type BandwidthLimitResponseTrailers struct {
27822782
Prefix *string `json:"prefix,omitempty" yaml:"prefix,omitempty"`
27832783
}
27842784

2785-
// BandwidthLimit holds bandwidth limiting configuration for request and/or response directions.
2786-
// At least one of Request or Response must be non-nil.
2787-
// +k8s:deepcopy-gen=true
2788-
type BandwidthLimit struct {
2789-
// Request configures bandwidth limiting for the request direction.
2790-
Request *BandwidthLimitConfig `json:"request,omitempty" yaml:"request,omitempty"`
2791-
// Response configures bandwidth limiting for the response direction.
2792-
Response *BandwidthLimitConfig `json:"response,omitempty" yaml:"response,omitempty"`
2793-
}
2794-
2795-
// BandwidthLimitConfig holds the bandwidth limit configuration for one direction.
2796-
// +k8s:deepcopy-gen=true
2797-
type BandwidthLimitConfig struct {
2798-
// LimitKibps specifies the bandwidth in kibibytes per second (KiB/s).
2799-
LimitKibps uint64 `json:"limitKibps" yaml:"limitKibps"`
2800-
// ResponseTrailers configures trailer headers appended when bandwidth limiting introduces delays.
2801-
// Only applicable to the response direction.
2802-
ResponseTrailers *BandwidthLimitResponseTrailers `json:"responseTrailers,omitempty" yaml:"responseTrailers,omitempty"`
2803-
}
2804-
2805-
// BandwidthLimitResponseTrailers holds trailer prefix configuration for bandwidth limiting.
2806-
// +k8s:deepcopy-gen=true
2807-
type BandwidthLimitResponseTrailers struct {
2808-
// Prefix is prepended to each trailer header name.
2809-
Prefix *string `json:"prefix,omitempty" yaml:"prefix,omitempty"`
2810-
}
2811-
28122785
type ProxyAccessLogType egv1a1.ProxyAccessLogType
28132786

28142787
const (

0 commit comments

Comments
 (0)