Skip to content

Introduce configurable bbs client timeouts #110

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
merged 1 commit into from
Nov 27, 2018
Merged

Introduce configurable bbs client timeouts #110

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
9 changes: 9 additions & 0 deletions jobs/cc_deployment_updater/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,15 @@ properties:
cc.diego.bbs.url:
description: "URL of the BBS Server"
default: https://bbs.service.cf.internal:8889
cc.diego.bbs.connect_timeout:
description: "Connect timeout when talking to BBS Server"
default: 10
cc.diego.bbs.send_timeout:
description: "Send timeout when talking to BBS Server"
default: 10
cc.diego.bbs.receive_timeout:
description: "Receive timeout when talking to BBS Server"
default: 10

cc.mutual_tls.ca_cert:
description: "PEM-encoded CA certificate for secure, mutually authenticated TLS communication"
Expand Down
3 changes: 3 additions & 0 deletions jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ diego:
key_file: /var/vcap/jobs/cc_deployment_updater/config/certs/mutual_tls.key
cert_file: /var/vcap/jobs/cc_deployment_updater/config/certs/mutual_tls.crt
ca_file: /var/vcap/jobs/cc_deployment_updater/config/certs/mutual_tls_ca.crt
connect_timeout: <%= p("cc.diego.bbs.connect_timeout") %>
send_timeout: <%= p("cc.diego.bbs.send_timeout") %>
receive_timeout: <%= p("cc.diego.bbs.receive_timeout") %>
pid_limit: <%= p("cc.diego.pid_limit") %>

default_app_memory: <%= p("cc.default_app_memory") %>
Expand Down
9 changes: 9 additions & 0 deletions jobs/cloud_controller_clock/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,15 @@ properties:
cc.diego.bbs.url:
description: "URL of the BBS Server"
default: https://bbs.service.cf.internal:8889
cc.diego.bbs.connect_timeout:
description: "Connect timeout when talking to BBS Server"
default: 10
cc.diego.bbs.send_timeout:
description: "Send timeout when talking to BBS Server"
default: 10
cc.diego.bbs.receive_timeout:
description: "Receive timeout when talking to BBS Server"
default: 10

cc.mutual_tls.ca_cert:
description: "PEM-encoded CA certificate for secure, mutually authenticated TLS communication"
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ diego:
key_file: /var/vcap/jobs/cloud_controller_clock/config/certs/mutual_tls.key
cert_file: /var/vcap/jobs/cloud_controller_clock/config/certs/mutual_tls.crt
ca_file: /var/vcap/jobs/cloud_controller_clock/config/certs/mutual_tls_ca.crt
connect_timeout: <%= p("cc.diego.bbs.connect_timeout") %>
send_timeout: <%= p("cc.diego.bbs.send_timeout") %>
receive_timeout: <%= p("cc.diego.bbs.receive_timeout") %>
pid_limit: <%= p("cc.diego.pid_limit") %>

opi:
Expand Down
9 changes: 9 additions & 0 deletions jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,15 @@ properties:
cc.diego.bbs.url:
description: "URL of the BBS Server"
default: https://bbs.service.cf.internal:8889
cc.diego.bbs.connect_timeout:
description: "Connect timeout when talking to BBS Server"
default: 10
cc.diego.bbs.send_timeout:
description: "Send timeout when talking to BBS Server"
default: 10
cc.diego.bbs.receive_timeout:
description: "Receive timeout when talking to BBS Server"
default: 10

cc.mutual_tls.ca_cert:
description: "PEM-encoded CA certificate for secure, mutually authenticated TLS communication"
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,9 @@ diego:
key_file: /var/vcap/jobs/cloud_controller_ng/config/certs/mutual_tls.key
cert_file: /var/vcap/jobs/cloud_controller_ng/config/certs/mutual_tls.crt
ca_file: /var/vcap/jobs/cloud_controller_ng/config/certs/mutual_tls_ca.crt
connect_timeout: <%= p("cc.diego.bbs.connect_timeout") %>
send_timeout: <%= p("cc.diego.bbs.send_timeout") %>
receive_timeout: <%= p("cc.diego.bbs.receive_timeout") %>
cc_uploader_url: <%= cc_uploader_url %>
docker_staging_stack: <%= p("cc.diego.docker_staging_stack") %>
file_server_url: <%= p("cc.diego.file_server_url") %>
Expand Down
9 changes: 9 additions & 0 deletions jobs/cloud_controller_worker/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,15 @@ properties:
cc.diego.bbs.url:
description: "URL of the BBS Server"
default: https://bbs.service.cf.internal:8889
cc.diego.bbs.connect_timeout:
description: "Connect timeout when talking to BBS Server"
default: 10
cc.diego.bbs.send_timeout:
description: "Send timeout when talking to BBS Server"
default: 10
cc.diego.bbs.receive_timeout:
description: "Receive timeout when talking to BBS Server"
default: 10

cc.mutual_tls.ca_cert:
description: "PEM-encoded CA certificate for secure, mutually authenticated TLS communication"
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ diego:
key_file: /var/vcap/jobs/cloud_controller_worker/config/certs/mutual_tls.key
cert_file: /var/vcap/jobs/cloud_controller_worker/config/certs/mutual_tls.crt
ca_file: /var/vcap/jobs/cloud_controller_worker/config/certs/mutual_tls_ca.crt
connect_timeout: <%= p("cc.diego.bbs.connect_timeout") %>
send_timeout: <%= p("cc.diego.bbs.send_timeout") %>
receive_timeout: <%= p("cc.diego.bbs.receive_timeout") %>
pid_limit: <%= p("cc.diego.pid_limit") %>

opi:
Expand Down