Skip to content
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

Jump to bottom

fix(envoy): remove apple flag #8314

Merged
merged 2 commits into from
Nov 10, 2023
Merged

fix(envoy): remove apple flag #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864c613
fix(envoy): remove deprecated flag
lukidzi Nov 10, 2023
503d75f
fix lint
lukidzi Nov 10, 2023
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
5 changes: 2 additions & 3 deletions pkg/xds/bootstrap/template_v3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ func genConfig(parameters configParameters, proxyConfig xds.Proxy, enableReloada
Name: "kuma",
LayerSpecifier: &envoy_bootstrap_v3.RuntimeLayer_StaticLayer{
StaticLayer: util_proto.MustStruct(map[string]interface{}{
"envoy.restart_features.use_apple_api_for_dns_lookups": false,
"re2.max_program_size.error_level": 4294967295,
"re2.max_program_size.warn_level": 1000,
"re2.max_program_size.error_level": 4294967295,
"re2.max_program_size.warn_level": 1000,
}),
},
}}
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/bootstrap.gateway.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
- name: gateway
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/bootstrap.k8s.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/bootstrap.overridden.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/bootstrap.universal.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.custom-config-minimal-request.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.custom-config.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.default-config-minimal-request.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.default-config-token-path.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.default-config.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.default-config.kubernetes.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.default-config.kubernetes.ipv6.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.gateway.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
- name: gateway
Expand Down
1 change: 0 additions & 1 deletion pkg/xds/bootstrap/testdata/generator.metrics-config.kubernetes.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ layeredRuntime:
layers:
- name: kuma
staticLayer:
envoy.restart_features.use_apple_api_for_dns_lookups: false
re2.max_program_size.error_level: 4294967295
re2.max_program_size.warn_level: 1000
node:
Expand Down
Loading