Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 0 additions & 3 deletions jobs/auctioneer/spec
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ properties:
diego.auctioneer.bbs.max_idle_conns_per_host:
description: "maximum number of idle http connections"

diego.auctioneer.rep.require_tls:
description: "Whether to require TLS for communication to the securable rep API server. Deprecated, Diego V2 and later require Rep communication to use TLS. This is only relevant when upgrading from V1 to ensure no downtime during the upgrade"
default: false
diego.auctioneer.rep.ca_cert:
description: "CA cert for communication to the rep."
diego.auctioneer.rep.client_cert:
Expand Down
1 change: 0 additions & 1 deletion jobs/auctioneer/templates/auctioneer.json.erb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
locks_locket_enabled: p("locks.locket.enabled"),
log_level: p("diego.auctioneer.log_level"),
rep_client_session_cache_size: p("diego.auctioneer.rep.client_session_cache_size"),
rep_require_tls: p("diego.auctioneer.rep.require_tls"),
cell_state_timeout: p("diego.auctioneer.cell_state_timeout"),
bin_pack_first_fit_weight: p("diego.auctioneer.bin_pack_first_fit_weight"),
starting_container_weight: p("diego.auctioneer.starting_container_weight"),
Expand Down
6 changes: 0 additions & 6 deletions jobs/auctioneer/templates/rep_ca.crt.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<% if p("diego.auctioneer.rep.require_tls") %>
<%= p("diego.auctioneer.rep.ca_cert") %>
<% else %>
<% if_p("diego.auctioneer.rep.ca_cert") do |value| %>
<%= value %>
<% end %>
<% end %>
6 changes: 0 additions & 6 deletions jobs/auctioneer/templates/rep_client.crt.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<% if p("diego.auctioneer.rep.require_tls") %>
<%= p("diego.auctioneer.rep.client_cert") %>
<% else %>
<% if_p("diego.auctioneer.rep.client_cert") do |value| %>
<%= value %>
<% end %>
<% end %>
6 changes: 0 additions & 6 deletions jobs/auctioneer/templates/rep_client.key.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<% if p("diego.auctioneer.rep.require_tls") %>
<%= p("diego.auctioneer.rep.client_key") %>
<% else %>
<% if_p("diego.auctioneer.rep.client_key") do |value| %>
<%= value %>
<% end %>
<% end %>
1 change: 0 additions & 1 deletion jobs/bbs/templates/bbs.json.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
listen_address: p("diego.bbs.listen_addr"),
health_address: p("diego.bbs.health_addr"),
rep_client_session_cache_size: p("diego.bbs.rep.client_session_cache_size"),
rep_require_tls: p("diego.bbs.rep.require_tls"),
log_level: p("diego.bbs.log_level"),
active_key_label: p("diego.bbs.active_key_label"),
debug_address: p("diego.bbs.debug_addr"),
Expand Down