Skip to content

Remove Consul! #656

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 4 commits into from
Dec 12, 2022
Merged

Remove Consul! #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd24efc
Remove Consul!
jrussett Sep 30, 2022
2d6d59b
Merge branch 'develop' into remove-consul-squishy-squashy
reneighbor Nov 21, 2022
4ced94a
go mod tidy && go mod vendor
reneighbor Nov 21, 2022
6769826
Merge branch 'develop' into remove-consul-squishy-squashy
jrussett Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions docs/metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ A list of component-level metrics emitted by Diego. Contributors interested in a
| `AuctioneerTaskAuctionsFailed` | Cumulative number of Tasks that the auctioneer failed to place on Diego cells. Emitted during each auction. | number |
| `AuctioneerTaskAuctionsStarted` | Cumulative number of Tasks that the auctioneer successfully placed on Diego cells. Emitted during each auction. | number |
| `LockHeld` | Whether an auctioneeer holds the auctioneer lock (in locket): 1 means the lock is held, and 0 means the lock was lost. Emitted periodically by the active auctioneer. | 0 or 1 (boolean) |
| `LockHeld.` `v1-locks-auctioneer_lock` | Whether an auctioneeer holds the auctioneer lock (in consul): 1 means the lock is held, and 0 means the lock was lost. Emitted periodically by the active auctioneer. | 0 or 1 (boolean) |
| `LockHeldDuration.` `v1-locks-auctioneer_lock` | Time the active auctioneeer has held the auctioneer lock. Emitted periodically by the active auctioneer. | ns |
| `RequestCount` | Cumulative number of requests the auctioneer has handled through its API. Emitted periodically. | number |
| `RequestLatency` | Time the auctioneer took to handle requests to its API endpoints. Emitted when the auctioneer handles requests. | ns |

Expand Down Expand Up @@ -56,8 +54,6 @@ A list of component-level metrics emitted by Diego. Contributors interested in a
| `LRPsRunning` | Total number of LRP instances that are running on cells. Emitted periodically. | number |
| `LRPsUnclaimed` | Total number of LRP instances that have not yet been claimed by a cell. Emitted periodically. | number |
| `LockHeld` | Whether a BBS holds the BBS lock (in locket): 1 means the lock is held, and 0 means the lock was lost. Emitted periodically by the active BBS server. | 0 or 1 (boolean) |
| `LockHeld.` `v1-locks-bbs_lock` | Whether a BBS holds the BBS lock (in consul): 1 means the lock is held, and 0 means the lock was lost. Emitted periodically by the active BBS server. | 0 or 1 (boolean) |
| `LockHeldDuration.` `v1-locks-bbs_lock` | Time the active BBS has held the BBS lock (in consul). Emitted periodically by the active BBS server. | ns |
| `MigrationDuration` | Time the BBS took to run migrations against its persistence store. Emitted each time a BBS becomes the active master. | ns |
| `OpenFileDescriptors` | Current (non-cumulative) number of open file descriptors held by the BBS. Emitted periodically. | number |
| `PresentCells` | Total number of cells that are maintaining presence with Locket. Emitted periodically. | number |
Expand Down Expand Up @@ -151,12 +147,9 @@ A list of component-level metrics emitted by Diego. Contributors interested in a
| Metric | Description | Unit |
| ------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
| `AddressCollisions` | Number of detected conflicting routes. A conflicting route is a set of two distinct instances with the same IP address on the routing table. | number |
| `ConsulDownMode` | Whether the route-emitter is able to connect with the consul correctly. | 0 or 1 boolean |
| `HTTPRouteCount` | Number of HTTP route associations (route-endpoint pairs) in the route-emitter's routing table. Emitted periodically when emitter is in local mode. | number |
| `HTTPRouteNATSMessagesEmitted` | Cumulative number of HTTP routing messages the route-emitter sends over NATS to the gorouter. | number |
| `InternalRouteNATSMessagesEmitted` | Cumulative number of internal routing messages the route-emitter sends over NATS to the service discovery controller. | number |
| `LockHeld.` `v1-locks-route_emitter_lock` | Whether a route-emitter holds its Consul lock: 1 means the lock is held, and 0 means the lock was lost. Emitted periodically by the active route-emitter. | 0 or 1 (boolean) |
| `LockHeldDuration.` `v1-locks-route_emitter_lock` | Time the active route-emitter has held the Consul lock. Emitted periodically by the active route-emitter. | ns |
| `RouteEmitterSyncDuration` | Time the route-emitter took to perform its synchronization pass. Emitted periodically. | ns |
| `RoutesRegistered` | Cumulative number of NATS route registrations emitted from the route-emitter as it reacts to changes to LRPs. | number |
| `RoutesSynced` | Cumulative number of route registrations emitted from the route-emitter during its periodic route-table emission. | number |
Expand Down
7 changes: 0 additions & 7 deletions jobs/auctioneer/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,6 @@ properties:
diego.auctioneer.locket.api_location:
description: "Hostname and port of the Locket server. When set, the auctioneer attempts to claim a lock from the Locket API."
default: locket.service.cf.internal:8891
diego.auctioneer.skip_consul_lock:
default: false
description: "Set to 'true' for the auctioneer to skip acquiring a Consul lock. Requires 'diego.auctioneer.locket.api_location' to be set."

enable_consul_service_registration:
description: "Enable the auctioneer to register itself as a service with Consul, for client discovery via Consul DNS. Do not disable without arranging alternate service discovery."
default: true

locks.locket.enabled:
description: When set, the auctioneer attempts to claim a lock from the Locket API.
Expand Down
10 changes: 0 additions & 10 deletions jobs/auctioneer/templates/auctioneer.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
report_interval: "1m",
lock_retry_interval: "5s",
lock_ttl: "15s",
consul_cluster: "http://127.0.0.1:8500",
debug_address: p("diego.auctioneer.debug_addr"),
enable_consul_service_registration: p("enable_consul_service_registration"),
listen_address: p("diego.auctioneer.listen_addr"),
locks_locket_enabled: p("locks.locket.enabled"),
log_level: p("diego.auctioneer.log_level"),
Expand Down Expand Up @@ -75,14 +73,6 @@
config[:locket_client_key_file] = "#{conf_dir}/certs/bbs/client.key"
end

if_p("diego.auctioneer.skip_consul_lock") do |skip_consul_lock|
config[:skip_consul_lock] = skip_consul_lock
end

if p("locks.locket.enabled") == false && p("diego.auctioneer.skip_consul_lock") == true
raise "'locks.locket.enabled' can not be false if 'diego.auctioneer.skip_consul_lock' is true."
end

config[:loggregator]={}
config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
if p("loggregator.use_v2_api") == true
Expand Down
10 changes: 0 additions & 10 deletions jobs/bbs/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,6 @@ properties:
diego.bbs.locket.api_location:
description: "Hostname and port of the Locket server. When set, the BBS attempts to claim a lock from the Locket API and will detect Diego cells registered with the Locket API."
default: locket.service.cf.internal:8891
diego.bbs.skip_consul_lock:
default: false
description: "Set to 'true' for the BBS to skip acquiring a Consul lock. Requires 'diego.bbs.locket.api_location' to be set."
diego.bbs.detect_consul_cell_registrations:
default: true
description: "Whether the BBS should detect Diego cell registrations present in the Consul key-value store. To prevent unexpected loss of capacity, set to 'false' only when the BBS uses Locket and when all Diego cells in the cluster maintain their registrations via Locket."

enable_consul_service_registration:
description: "Enable the BBS to register itself as a service with Consul, for client discovery via Consul DNS. Do not disable without arranging alternate service discovery."
default: true

limits.open_files:
description: Maximum number of files (including sockets) the BBS process may have open.
Expand Down
15 changes: 0 additions & 15 deletions jobs/bbs/templates/bbs.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@
task_callback_workers: 1000,
listen_address: p("diego.bbs.listen_addr"),
health_address: p("diego.bbs.health_addr"),
consul_cluster: "http://127.0.0.1:8500",
enable_consul_service_registration: p("enable_consul_service_registration"),
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"),
locks_locket_enabled: p("locks.locket.enabled"),
cell_registrations_locket_enabled: p("cell_registrations.locket.enabled"),
detect_consul_cell_registrations: p("diego.bbs.detect_consul_cell_registrations"),
max_task_retries: p("tasks.max_retries"),
max_data_string_length: p("logging.max_data_string_length"),
}
Expand Down Expand Up @@ -171,18 +168,6 @@
config[:locket_client_key_file] = "#{conf_dir}/certs/server.key"
end

if_p("diego.bbs.skip_consul_lock") do |skip_consul_lock|
config[:skip_consul_lock] = skip_consul_lock
end

if p("locks.locket.enabled") == false && p("diego.bbs.skip_consul_lock") == true
raise "'locks.locket.enabled' can not be false if 'diego.bbs.skip_consul_lock' is true."
end

if p("cell_registrations.locket.enabled") == false && p("diego.bbs.detect_consul_cell_registrations") == false
raise "'cell_registrations.locket.enabled' and 'diego.bbs.detect_consul_cell_registrations' can not both be false."
end

config[:loggregator]={}
config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
if p("loggregator.use_v2_api") == true
Expand Down
4 changes: 0 additions & 4 deletions jobs/file_server/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ properties:
tls.key:
description: "PEM-encoded tls key"

enable_consul_service_registration:
description: "Enable the file-server to register itself as a service with Consul, for client discovery via Consul DNS. Do not disable without arranging alternate service discovery."
default: true

logging.format.timestamp:
description: "Format for timestamp in component logs. Valid values are 'unix-epoch' and 'rfc3339'."
default: "unix-epoch"
Expand Down
2 changes: 0 additions & 2 deletions jobs/file_server/templates/file_server.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

config = {
server_address: p("diego.file_server.listen_addr"),
consul_cluster: "http://127.0.0.1:8500",
debug_address: p("diego.file_server.debug_addr"),
enable_consul_service_registration: p("enable_consul_service_registration"),
static_directory: p("diego.file_server.static_directory"),
https_server_enabled: p("https_server_enabled"),
https_listen_addr: p("https_listen_addr"),
Expand Down
3 changes: 0 additions & 3 deletions jobs/locket/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ properties:
default: false
diego.locket.sql.ca_cert:
description: "Bundle of CA certificates for the Locket to verify the SQL server SSL certificate when connecting via SSL"
enable_consul_service_registration:
description: "Enable the Locket server to register itself as a service with Consul, for client discovery via Consul DNS. Do not disable without arranging alternate service discovery."
default: true

logging.format.timestamp:
description: "Format for timestamp in component logs. Valid values are 'unix-epoch' and 'rfc3339'."
Expand Down
2 changes: 0 additions & 2 deletions jobs/locket/templates/locket.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ config = {
report_interval: "1m",
ca_file: "#{conf_dir}/certs/ca.crt",
cert_file: "#{conf_dir}/certs/server.crt",
consul_cluster: "http://127.0.0.1:8500",
debug_address: p("diego.locket.debug_addr"),
enable_consul_service_registration: p("enable_consul_service_registration"),
key_file: "#{conf_dir}/certs/server.key",
listen_address: p("diego.locket.listen_addr"),
log_level: p("diego.locket.log_level"),
Expand Down
18 changes: 1 addition & 17 deletions jobs/rep/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ templates:
trusted_ca_certificates.json.erb: config/certs/rep/trusted_ca_certificates.json
instance_identity.crt.erb: config/certs/rep/instance_identity.crt
instance_identity.key.erb: config/certs/rep/instance_identity.key
consul_ca.crt.erb: config/certs/consul/ca.crt
consul_client.crt.erb: config/certs/consul/client.crt
consul_client.key.erb: config/certs/consul/client.key
rep.json.erb: config/rep.json
bpm.yml.erb: config/bpm.yml
bpm-pre-start.erb: bin/bpm-pre-start
Expand Down Expand Up @@ -106,16 +103,6 @@ properties:
tls.ca_cert:
description: "REQUIRED: PEM-encoded tls client CA certificate for asset upload/download"

diego.rep.consul.require_tls:
description: "Require mutual TLS to talk to the local consul API"
default: false
diego.rep.consul.ca_cert:
description: "PEM-encoded CA certificate"
diego.rep.consul.client_cert:
description: "PEM-encoded client certificate"
diego.rep.consul.client_key:
description: "PEM-encoded client key"

diego.executor.memory_capacity_mb:
description: "the memory capacity the executor should manage. this should not be greater than the actual memory on the VM"
default: "auto"
Expand Down Expand Up @@ -228,12 +215,9 @@ properties:
default: "rep"

diego.rep.locket.api_location:
description: "Hostname and port of the Locket server. When set, the cell rep will establish its cell registration in the Locket API instead of in the Consul key-value store."
description: "Hostname and port of the Locket server. When set, the cell rep will establish its cell registration in the Locket API."
default: locket.service.cf.internal:8891

enable_consul_service_registration:
description: "Enable the cell rep to register itself as a service with Consul, for client discovery via Consul DNS. Do not disable without arranging alternate service discovery."
default: true
enable_declarative_healthcheck:
description: "When set, enables the rep to prefer the LRP CheckDefinition to healthcheck instances over the Monitor action. Requires Garden-Runc v1.10.0+"
default: false
Expand Down
3 changes: 0 additions & 3 deletions jobs/rep/templates/consul_ca.crt.erb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions jobs/rep/templates/consul_client.crt.erb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions jobs/rep/templates/consul_client.key.erb
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions jobs/rep/templates/rep.json.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
debug_address: p("diego.rep.debug_addr"),
delete_work_pool_size: p("diego.executor.delete_work_pool_size"),
disk_mb: p("diego.executor.disk_capacity_mb").to_s,
enable_consul_service_registration: p("enable_consul_service_registration"),
enable_declarative_healthcheck: p("enable_declarative_healthcheck"),
declarative_healthcheck_path: "/var/vcap/packages/healthcheck",
enable_container_proxy: p("containers.proxy.enabled"),
Expand Down Expand Up @@ -118,15 +117,6 @@
config[:volman_driver_paths] = value
end

if p("diego.rep.consul.require_tls")
config[:consul_cluster] = "https://127.0.0.1:8500"
config[:consul_ca_cert] = "#{conf_dir}/certs/consul/ca.crt"
config[:consul_client_cert] = "#{conf_dir}/certs/consul/client.crt"
config[:consul_client_key] = "#{conf_dir}/certs/consul/client.key"
else
config[:consul_cluster] = "http://127.0.0.1:8500"
end

if_p("diego.rep.bbs.client_session_cache_size") do |value|
config[:bbs_client_session_cache_size] = value
end
Expand Down
16 changes: 0 additions & 16 deletions jobs/rep_windows/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ templates:
trusted_ca_certificates.json.erb: config/certs/rep/trusted_ca_certificates.json
instance_identity.crt.erb: config/certs/rep/instance_identity.crt
instance_identity.key.erb: config/certs/rep/instance_identity.key
consul_ca.crt.erb: config/certs/consul/ca.crt
consul_client.crt.erb: config/certs/consul/client.crt
consul_client.key.erb: config/certs/consul/client.key
rep.json.erb: config/rep.json
loggregator_ca.crt.erb: config/certs/loggregator/ca.crt
loggregator_client.crt.erb: config/certs/loggregator/client.crt
Expand Down Expand Up @@ -102,16 +99,6 @@ properties:
tls.ca_cert:
description: "REQUIRED: PEM-encoded tls client CA certificate for asset upload/download"

diego.rep.consul.require_tls:
description: "Require mutual TLS to talk to the local consul API"
default: false
diego.rep.consul.ca_cert:
description: "PEM-encoded CA certificate"
diego.rep.consul.client_cert:
description: "PEM-encoded client certificate"
diego.rep.consul.client_key:
description: "PEM-encoded client key"

diego.executor.memory_capacity_mb:
description: "the memory capacity the executor should manage. this should not be greater than the actual memory on the VM"
default: "auto"
Expand Down Expand Up @@ -241,9 +228,6 @@ properties:
description: "Hostname and port of the locket server"
default: locket.service.cf.internal:8891

enable_consul_service_registration:
description: "Enable the cell rep to register itself as a service with Consul, for client discovery via Consul DNS. Do not disable without arranging alternate service discovery."
default: true
enable_declarative_healthcheck:
description: "When set, enables the rep to prefer the LRP CheckDefinition to healthcheck instances over the Monitor action."
default: false
Expand Down
3 changes: 0 additions & 3 deletions jobs/rep_windows/templates/consul_ca.crt.erb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions jobs/rep_windows/templates/consul_client.crt.erb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions jobs/rep_windows/templates/consul_client.key.erb
View file
Open in desktop

This file was deleted.

Loading