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.

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

hotrestart: remove dynamic_resources from config used by hotrestart_test #8162

Merged
merged 1 commit into from
Sep 6, 2019
Merged
Changes from all commits
Commits
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
hotrestart: remove dynamic_resources from server config used by hotre…
…start_test

In the server config file `test/config/integration/server.yaml` used by
//test/integration:hotrestart_test, `dynamic_resources` includes `lds_config`
and `cds_config` definitions, which use HTTP API to fetch config, but CDS and
LDS service do not exist, so the initial fetch will be failed with a
connection failure, then Envoy server continue startup.

Envoy server shouldn't continue startup because connection failure, see
issue #8046.

For this test, `dynamic_resources` is not needed, this change clean it up.

Signed-off-by: lhuang8 <[email protected]>
  • Loading branch information
lhuang8 authored and Lei committed Sep 5, 2019
commit 01541a42ee721d0250f0ccc6bde30b5b8b5ca314
35 changes: 1 addition & 34 deletions test/config/integration/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,27 +79,6 @@ static_resources:
catch_all_route:
cluster: redis
clusters:
- name: cds
connect_timeout: 5s
hosts:
- socket_address:
address: {{ ip_loopback_address }}
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
- name: rds
connect_timeout: 5s
hosts:
- socket_address:
address: {{ ip_loopback_address }}
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
- name: lds
connect_timeout: 5s
hosts:
- socket_address:
address: {{ ip_loopback_address }}
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
- name: cluster_1
connect_timeout: 5s
hosts:
Expand Down Expand Up @@ -141,19 +120,7 @@ static_resources:
port_value: 4
dns_lookup_family: "{{ dns_lookup_family }}"
outlier_detection: {}
dynamic_resources:
lds_config:
api_config_source:
api_type: REST
cluster_names:
- lds
refresh_delay: 30s
cds_config:
api_config_source:
api_type: REST
cluster_names:
- cds
refresh_delay: 30s
dynamic_resources: {}
cluster_manager: {}
flags_path: "/invalid_flags"
stats_sinks:
Expand Down