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

Add keepalive configs as templated strings and modify their values #3624

Merged
merged 2 commits into from
Nov 28, 2024
Merged

Add keepalive configs as templated strings and modify their values #3624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98e0d0
Add keepalive configs as templated values
JDPrabasha Nov 28, 2024
ac33a9c
Reset keepalive timeout duration to 5 minutes
JDPrabasha Nov 28, 2024
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
4 changes: 4 additions & 0 deletions router/src/main/resources/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ ENV ROUTER_LABEL="Default"
ENV ROUTER_PRIVATE_KEY_PATH=/home/wso2/security/keystore/mg.key
ENV ROUTER_PUBLIC_CERT_PATH=/home/wso2/security/keystore/mg.pem

ENV KEEPALIVE_PROBES=3
ENV KEEPALIVE_TIMEOUT=60
ENV KEEPALIVE_INTERVAL=30

ENV ADAPTER_HOST=adapter
ENV ADAPTER_PORT=18000
ENV ADAPTER_CA_CERT_PATH=/home/wso2/security/truststore/mg.pem
Expand Down
6 changes: 3 additions & 3 deletions router/src/main/resources/envoy.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ static_resources:
connect_timeout: 1s
upstream_connection_options:
tcp_keepalive:
keepalive_probes: 3
keepalive_time: 300
keepalive_interval: 30
keepalive_probes: '${KEEPALIVE_PROBES}'
Copy link
Contributor

@renuka-fernando renuka-fernando Nov 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we prefix ADAPTER to make these config more specific?

Suggested change
keepalive_probes: '${KEEPALIVE_PROBES}'
keepalive_probes: '${ADAPTER_KEEPALIVE_PROBES}'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can keep this as it is and use it in all places. Hence +1

keepalive_time: '${KEEPALIVE_TIMEOUT}'
keepalive_interval: '${KEEPALIVE_INTERVAL}'
load_assignment:
cluster_name: xds_cluster
endpoints:
Expand Down
Loading