Skip to content

[release-v1.6] allow updating initial_fetch_timeout in bootstrap #8069

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
arkodg merged 1 commit into from
Jan 28, 2026
Merged

[release-v1.6] allow updating initial_fetch_timeout in bootstrap #8069

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
2 changes: 2 additions & 0 deletions internal/xds/bootstrap/testdata/validate/valid-user-bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ dynamicResources:
ldsConfig:
ads: {}
resourceApiVersion: V3
initial_fetch_timeout: 0s
cdsConfig:
ads: {}
resourceApiVersion: V3
initial_fetch_timeout: 0s
staticResources:
clusters:
- connectTimeout: 10s
Expand Down
6 changes: 4 additions & 2 deletions internal/xds/bootstrap/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

bootstrapv3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
"github.com/google/go-cmp/cmp"
"google.golang.org/protobuf/testing/protocmp"

Expand Down Expand Up @@ -59,9 +60,10 @@ func Validate(boostrapConfig *egv1a1.ProxyBootstrap) error {
return err
}

// Ensure dynamic resources config is same
// Ensure dynamic resources config is same except for initial_fetch_timeout
if userBootstrap.DynamicResources == nil ||
cmp.Diff(userBootstrap.DynamicResources, defaultBootstrap.DynamicResources, protocmp.Transform()) != "" {
cmp.Diff(userBootstrap.DynamicResources, defaultBootstrap.DynamicResources, protocmp.Transform(),
protocmp.IgnoreFields(&corev3.ConfigSource{}, "initial_fetch_timeout")) != "" {
return fmt.Errorf("dynamic_resources cannot be modified")
}

Expand Down