cloudfoundry · geofffranks · Sep 30, 2022 · Sep 29, 2022 · Sep 30, 2022 · Sep 30, 2022
@@ -55,6 +55,10 @@ builds:
     version: af843d808049d1a0fb53d2bb97e93b91ea34931dee827f425731d8c121cb6675
     blobstore_id: 66244dcc-0fee-4968-77f5-7062b567c3ee
     sha1: sha256:48279793184865e884a15d3e9c1c9f347faa6f2318ca49a1c2ed5801d3843de4
+  b0a9ab78afb8dc8b2ffc5d0e50e09edd13071f3d:
+    version: b0a9ab78afb8dc8b2ffc5d0e50e09edd13071f3d
+    blobstore_id: 39eca094-4148-4d3f-4223-beb1ba8e1fa6
+    sha1: f035baacc5dbe427e70db4db668da50b6f022085
   b14e22679e97b7100b5ff52051f83c38de7892d2:
     version: b14e22679e97b7100b5ff52051f83c38de7892d2
     blobstore_id: fa33770d-6b58-40cc-7fc8-794f3ec1eb64

@@ -59,6 +59,10 @@ builds:
     version: 6cfa6d0695686c8b7b89247366d996182e50d9d5ef73252adae45801075e2d58
     blobstore_id: d5665b9f-07d8-448f-6b5d-8b89d74e9cc6
     sha1: sha256:4300fd5409fb7daa1187c3853f9f25119bd7f651795d1eb72f3a14612998bc61
+  6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e:
+    version: 6f86822e163425375f3a1b9d781b678f30fd4b6ee619b033fcf5e7e18563e74e
+    blobstore_id: e76ca3b0-d4d3-4684-5e95-47e1c537b15e
+    sha1: sha256:33b1f2a465c2f163e5ef31e072b2c7692ae0758ca2b7866b61d98663a6ba6329
   79f531850e62e3801f1dfa4acd11c421aebe653cd4316f6e49061818071bb617:
     version: 79f531850e62e3801f1dfa4acd11c421aebe653cd4316f6e49061818071bb617
     blobstore_id: 895eb0ef-fab7-4d02-46f9-1f0c136e6fa1

@@ -35,6 +35,10 @@ builds:
     version: 3ba0cfb6545c4d4587012604b3fb30ef49d814ae3bc410d995fa0ebd7f55efe4
     blobstore_id: 39f83092-18fa-42af-529a-5646b6b9c5e5
     sha1: sha256:ea8d957aeaefb91041d972dc9f0a3ea70ac8404002385074d92b945b86dc7647
+  47e7057c2fd4461f05d4a8f62e1050acd4e9138e033f92f47c2df59bc13ac8b4:
+    version: 47e7057c2fd4461f05d4a8f62e1050acd4e9138e033f92f47c2df59bc13ac8b4
+    blobstore_id: ba382aa1-2c05-46d7-5e3b-c06d3c6e425d
+    sha1: sha256:1e2592ba57e820d81ea31a28a02e9ebf8642ce44371605fa2866f192f2e7baa7
   4b12ea983b66efdef9ce75aeb39901a2a966970559c1189f591aa87071852bcc:
     version: 4b12ea983b66efdef9ce75aeb39901a2a966970559c1189f591aa87071852bcc
     blobstore_id: e1807f08-69a7-47ea-6177-73a7bb633666

@@ -19,6 +19,10 @@ builds:
     version: 09f0d7be556971bd144a69d6cc988f0bea3f66ee
     blobstore_id: 73b7adec-1a65-41a7-8d33-257ed7e2a82c
     sha1: 56591c54a706b77be7ea6516b5570fea0ac1c118
+  0e3787b990c702583708dbba7703a67f14492176:
+    version: 0e3787b990c702583708dbba7703a67f14492176
+    blobstore_id: 274a864a-1fe7-4159-72a8-70841cd3c798
+    sha1: f525ae079a57bc0c5c2b03a916ffe4be38f11a20
   20fb8baf82a4c4129acfc2440b16293d27f9cdb5:
     version: 20fb8baf82a4c4129acfc2440b16293d27f9cdb5
     blobstore_id: bb6d61ae-798c-4a65-7344-6f07f427248d

@@ -343,6 +343,10 @@ builds:
     version: 9c5c6c129d948cf2c702fc3383104377b045a758
     blobstore_id: 9117e414-4942-4968-4b67-741fcc360583
     sha1: 39ccd7eb52bc0819625bde8b35c2aa0392d4f10d
+  9e00687b10b5c635d91d8ce028f8a1fa63e02976:
+    version: 9e00687b10b5c635d91d8ce028f8a1fa63e02976
+    blobstore_id: c90792d5-2ce8-484b-55ae-1cc69e28baf0
+    sha1: 32fcea275c056ccfa20db0f9adce149afd9b2ba2
   9e22ef790b016ca0a268cf97d370fc013128b8a3:
     version: 9e22ef790b016ca0a268cf97d370fc013128b8a3
     blobstore_id: b3148471-d739-4170-7f9d-ce343997f344

@@ -203,6 +203,10 @@ builds:
     version: 7814c2078383b40085474a48dcb302a42dce378dc66ef3ad082bf483fb503f0d
     blobstore_id: ebf8ce57-8636-48f6-5f99-bda35bdb1d74
     sha1: sha256:f332fceb3cbba65202f26dc5759c47ada63aa8310a28e8a0a84b7098e007429f
+  786173dd1a5821fcb6756fdfd7e05bd984291b57:
+    version: 786173dd1a5821fcb6756fdfd7e05bd984291b57
+    blobstore_id: 15db9709-8e58-45fd-5175-1871cba2eb6e
+    sha1: 0c4205f1e2677c0d578b5cccdfac4e1a915f48a0
   7a7a129b9112f95965582103e58812aa79f63551:
     version: 7a7a129b9112f95965582103e58812aa79f63551
     blobstore_id: b2331d09-4640-4610-89c9-48174fed7f38

@@ -1,2 +1,2 @@
-This file was updated by CI on 2022-09-21 14:14:00
-go1.19.1
+This file was updated by CI on 2022-10-04 18:18:27
+go1.19.2
@@ -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               |
 
@@ -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            |
@@ -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           |

@@ -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.

@@ -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"),
@@ -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

@@ -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.

@@ -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"),
   }
@@ -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

@@ -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"

@@ -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"),

@@ -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'."

@@ -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"),

@@ -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
@@ -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"
@@ -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