From 576dbaa79a656737eb69cc59a29b10a0c0e7dfc5 Mon Sep 17 00:00:00 2001 From: encalada Date: Tue, 4 Jul 2017 13:23:03 +0200 Subject: [PATCH 01/37] refactoring auctioneer server tls enablement, to be more adhoc to the rep and bbs approach --- docs/tls-configuration.md | 15 ++++++--------- jobs/auctioneer/spec | 3 +++ jobs/auctioneer/templates/auctioneer.json.erb | 3 ++- jobs/auctioneer/templates/auctioneer_ca.crt.erb | 6 +++++- .../templates/auctioneer_server.crt.erb | 6 +++++- .../templates/auctioneer_server.key.erb | 6 +++++- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/docs/tls-configuration.md b/docs/tls-configuration.md index f1329dea89..e275f50c95 100644 --- a/docs/tls-configuration.md +++ b/docs/tls-configuration.md @@ -12,15 +12,12 @@ the rep servers on the cell vms, via the `diego.rep.require_tls` and `false`. When enabled, the operator must provide TLS certificates and keys for the rep server and its clients (other components in the Diego deployment). -TLS with mutual authentication can be enabled for communication to the Auctioneer -server, via the presence of any of the following properties: `diego.auctioneer.ca_cert`, -`diego.auctioneer.server_cert`, `diego.auctioneer.server_key`. If TLS is enabled for -the Auctioneer, the operator must also specify the client certificates and keys -required for mutual authentication in the following properties: `diego.bbs.auctioneer.ca_cert`, -`diego.bbs.auctioneer.client_cert`, `diego.bbs.auctioneer.client_key`. -The operator may also set `diego.bbs.auctioneer.require_tls` to `true` to ensure -that all communication between the BBS and the Auctioneer server is secured using TLS -with mutual authentication. + +TLS with mutual authentication can be enabled for communication to +the Auctioneer server, via the `diego.auctioneer.require_tls` and +`diego.bbs.auctioneer.require_tls` BOSH properties. These properties default to +`false`. When enabled, the operator must provide TLS certificates and keys for +the Auctioneer server and the BBS client. TLS with mutual authentication can be enabled for upload and download of assets into the containers, via the presence of the following properties: diff --git a/jobs/auctioneer/spec b/jobs/auctioneer/spec index 001cf950b5..da88bae1a4 100644 --- a/jobs/auctioneer/spec +++ b/jobs/auctioneer/spec @@ -21,6 +21,9 @@ packages: - auctioneer properties: + diego.auctioneer.require_tls: + description: "Whether to require mutual TLS for communication to the securable auctioneer API server" + default: false diego.auctioneer.ca_cert: description: "PEM-encoded CA certificate for the auctioneer API server." diego.auctioneer.server_cert: diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index e8c39b9b31..fc8c54222d 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -2,6 +2,7 @@ CONF_DIR = "/var/vcap/jobs/auctioneer/config" config = { + require_tls: p("diego.auctioneer.require_tls"), dropsonde_port: p("diego.auctioneer.dropsonde_port"), consul_cluster: "http://127.0.0.1:8500", debug_address: p("diego.auctioneer.debug_addr"), @@ -37,7 +38,7 @@ config[:rep_ca_cert] = "#{CONF_DIR}/certs/rep/ca.crt" end - if p("diego.auctioneer.ca_cert", "") != "" || p("diego.auctioneer.server_cert", "") != "" || p("diego.auctioneer.server_key", "") != "" + if p("diego.auctioneer.require_tls") config[:ca_cert_file] = "#{CONF_DIR}/certs/auctioneer/ca.crt" config[:server_cert_file] = "#{CONF_DIR}/certs/auctioneer/server.crt" config[:server_key_file] = "#{CONF_DIR}/certs/auctioneer/server.key" diff --git a/jobs/auctioneer/templates/auctioneer_ca.crt.erb b/jobs/auctioneer/templates/auctioneer_ca.crt.erb index 23a0e0b08b..1bf7690c2e 100644 --- a/jobs/auctioneer/templates/auctioneer_ca.crt.erb +++ b/jobs/auctioneer/templates/auctioneer_ca.crt.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.ca_cert") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.ca_cert") %> +<% else %> + <% if_p("diego.auctioneer.ca_cert") do |value| %> <%= value %> + <% end %> <% end %> diff --git a/jobs/auctioneer/templates/auctioneer_server.crt.erb b/jobs/auctioneer/templates/auctioneer_server.crt.erb index ce646ce247..193fd15e31 100644 --- a/jobs/auctioneer/templates/auctioneer_server.crt.erb +++ b/jobs/auctioneer/templates/auctioneer_server.crt.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.server_cert") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.server_cert") %> +<% else %> + <% if_p("diego.auctioneer.server_cert") do |value| %> <%= value %> + <% end %> <% end %> diff --git a/jobs/auctioneer/templates/auctioneer_server.key.erb b/jobs/auctioneer/templates/auctioneer_server.key.erb index 23d3f9e507..21aec118d7 100644 --- a/jobs/auctioneer/templates/auctioneer_server.key.erb +++ b/jobs/auctioneer/templates/auctioneer_server.key.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.server_key") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.server_key") %> +<% else %> + <% if_p("diego.auctioneer.server_key") do |value| %> <%= value %> + <% end %> <% end %> From 20b42f2a71d8d65b98180ad3fc7647304a3513d8 Mon Sep 17 00:00:00 2001 From: encalada Date: Tue, 4 Jul 2017 13:23:03 +0200 Subject: [PATCH 02/37] refactoring auctioneer server tls enablement, to be more adhoc to the rep and bbs approach --- docs/tls-configuration.md | 15 ++++++--------- jobs/auctioneer/spec | 3 +++ jobs/auctioneer/templates/auctioneer.json.erb | 3 ++- jobs/auctioneer/templates/auctioneer_ca.crt.erb | 6 +++++- .../templates/auctioneer_server.crt.erb | 6 +++++- .../templates/auctioneer_server.key.erb | 6 +++++- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/docs/tls-configuration.md b/docs/tls-configuration.md index f1329dea89..e275f50c95 100644 --- a/docs/tls-configuration.md +++ b/docs/tls-configuration.md @@ -12,15 +12,12 @@ the rep servers on the cell vms, via the `diego.rep.require_tls` and `false`. When enabled, the operator must provide TLS certificates and keys for the rep server and its clients (other components in the Diego deployment). -TLS with mutual authentication can be enabled for communication to the Auctioneer -server, via the presence of any of the following properties: `diego.auctioneer.ca_cert`, -`diego.auctioneer.server_cert`, `diego.auctioneer.server_key`. If TLS is enabled for -the Auctioneer, the operator must also specify the client certificates and keys -required for mutual authentication in the following properties: `diego.bbs.auctioneer.ca_cert`, -`diego.bbs.auctioneer.client_cert`, `diego.bbs.auctioneer.client_key`. -The operator may also set `diego.bbs.auctioneer.require_tls` to `true` to ensure -that all communication between the BBS and the Auctioneer server is secured using TLS -with mutual authentication. + +TLS with mutual authentication can be enabled for communication to +the Auctioneer server, via the `diego.auctioneer.require_tls` and +`diego.bbs.auctioneer.require_tls` BOSH properties. These properties default to +`false`. When enabled, the operator must provide TLS certificates and keys for +the Auctioneer server and the BBS client. TLS with mutual authentication can be enabled for upload and download of assets into the containers, via the presence of the following properties: diff --git a/jobs/auctioneer/spec b/jobs/auctioneer/spec index 001cf950b5..da88bae1a4 100644 --- a/jobs/auctioneer/spec +++ b/jobs/auctioneer/spec @@ -21,6 +21,9 @@ packages: - auctioneer properties: + diego.auctioneer.require_tls: + description: "Whether to require mutual TLS for communication to the securable auctioneer API server" + default: false diego.auctioneer.ca_cert: description: "PEM-encoded CA certificate for the auctioneer API server." diego.auctioneer.server_cert: diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index e8c39b9b31..fc8c54222d 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -2,6 +2,7 @@ CONF_DIR = "/var/vcap/jobs/auctioneer/config" config = { + require_tls: p("diego.auctioneer.require_tls"), dropsonde_port: p("diego.auctioneer.dropsonde_port"), consul_cluster: "http://127.0.0.1:8500", debug_address: p("diego.auctioneer.debug_addr"), @@ -37,7 +38,7 @@ config[:rep_ca_cert] = "#{CONF_DIR}/certs/rep/ca.crt" end - if p("diego.auctioneer.ca_cert", "") != "" || p("diego.auctioneer.server_cert", "") != "" || p("diego.auctioneer.server_key", "") != "" + if p("diego.auctioneer.require_tls") config[:ca_cert_file] = "#{CONF_DIR}/certs/auctioneer/ca.crt" config[:server_cert_file] = "#{CONF_DIR}/certs/auctioneer/server.crt" config[:server_key_file] = "#{CONF_DIR}/certs/auctioneer/server.key" diff --git a/jobs/auctioneer/templates/auctioneer_ca.crt.erb b/jobs/auctioneer/templates/auctioneer_ca.crt.erb index 23a0e0b08b..1bf7690c2e 100644 --- a/jobs/auctioneer/templates/auctioneer_ca.crt.erb +++ b/jobs/auctioneer/templates/auctioneer_ca.crt.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.ca_cert") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.ca_cert") %> +<% else %> + <% if_p("diego.auctioneer.ca_cert") do |value| %> <%= value %> + <% end %> <% end %> diff --git a/jobs/auctioneer/templates/auctioneer_server.crt.erb b/jobs/auctioneer/templates/auctioneer_server.crt.erb index ce646ce247..193fd15e31 100644 --- a/jobs/auctioneer/templates/auctioneer_server.crt.erb +++ b/jobs/auctioneer/templates/auctioneer_server.crt.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.server_cert") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.server_cert") %> +<% else %> + <% if_p("diego.auctioneer.server_cert") do |value| %> <%= value %> + <% end %> <% end %> diff --git a/jobs/auctioneer/templates/auctioneer_server.key.erb b/jobs/auctioneer/templates/auctioneer_server.key.erb index 23d3f9e507..21aec118d7 100644 --- a/jobs/auctioneer/templates/auctioneer_server.key.erb +++ b/jobs/auctioneer/templates/auctioneer_server.key.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.server_key") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.server_key") %> +<% else %> + <% if_p("diego.auctioneer.server_key") do |value| %> <%= value %> + <% end %> <% end %> From a85e4e92053292bdc4897d1ae07b94eed86f82aa Mon Sep 17 00:00:00 2001 From: "CI (Automated)" Date: Wed, 12 Jul 2017 16:51:58 +0000 Subject: [PATCH 03/37] Create final release 1.22.0 --- .final_builds/packages/auctioneer/index.yml | 4 + .final_builds/packages/bbs/index.yml | 4 + .../packages/benchmark-bbs/index.yml | 4 + .final_builds/packages/cfdot/index.yml | 4 + .final_builds/packages/diego-sshd/index.yml | 4 + .final_builds/packages/healthcheck/index.yml | 4 + .../packages/healthcheck_windows/index.yml | 4 + .final_builds/packages/locket/index.yml | 4 + .final_builds/packages/rep/index.yml | 4 + .final_builds/packages/rep_windows/index.yml | 4 + .../packages/route_emitter/index.yml | 4 + .../packages/route_emitter_windows/index.yml | 4 + .final_builds/packages/ssh_proxy/index.yml | 4 + .final_builds/packages/vizzini/index.yml | 4 + .../packages/windows_app_lifecycle/index.yml | 4 + releases/diego-1.22.0.yml | 187 ++++++++++++++++++ releases/index.yml | 2 + 17 files changed, 249 insertions(+) create mode 100644 releases/diego-1.22.0.yml diff --git a/.final_builds/packages/auctioneer/index.yml b/.final_builds/packages/auctioneer/index.yml index 235ca8bbdc..ef03444d28 100644 --- a/.final_builds/packages/auctioneer/index.yml +++ b/.final_builds/packages/auctioneer/index.yml @@ -1280,4 +1280,8 @@ builds: version: 17bcf9d2715e0a22f3b754fec08d4f768d2b7b48 sha1: 35fd6bedfa22b925c1adbb071c6f1079e5394ced blobstore_id: 593b6e7a-c60c-4617-a4f0-52fb957b48fc + 20545141cea1e9edbcf2886587a373df85ac896f: + version: 20545141cea1e9edbcf2886587a373df85ac896f + sha1: 957ab48788b0ef3c5237d3b76b95e84b4104d512 + blobstore_id: 5b9fcb2e-a42e-4a19-92de-e87dc7f6db3e format-version: '2' diff --git a/.final_builds/packages/bbs/index.yml b/.final_builds/packages/bbs/index.yml index a9c51a4605..d0399f46bc 100644 --- a/.final_builds/packages/bbs/index.yml +++ b/.final_builds/packages/bbs/index.yml @@ -484,4 +484,8 @@ builds: version: c45fdcee7207f18158d60445cdd1a794c7177b1a sha1: 39e0f6def226c36c6d7b310634d3a83009c63079 blobstore_id: ceb70a22-3275-40c5-803f-a18541fd1271 + ec864334278588163141f484a045c88802e04724: + version: ec864334278588163141f484a045c88802e04724 + sha1: cf71eafe7a5d0c4a4fdb390488c135487a0d35c1 + blobstore_id: d3ad2956-84b8-41eb-acb8-1d387f6e42b1 format-version: '2' diff --git a/.final_builds/packages/benchmark-bbs/index.yml b/.final_builds/packages/benchmark-bbs/index.yml index d51f86a014..966c9e2d50 100644 --- a/.final_builds/packages/benchmark-bbs/index.yml +++ b/.final_builds/packages/benchmark-bbs/index.yml @@ -332,4 +332,8 @@ builds: version: 2e70bb0d558ca8ff1773925ba63a250b0684452a sha1: d6dea21bb8de59ca9dbb6670da2c7af97d8d281e blobstore_id: cc889a87-9090-45b7-8d55-48c67138cf10 + cc173e1d081296ba1aa2c2e63f8788032868d48d: + version: cc173e1d081296ba1aa2c2e63f8788032868d48d + sha1: 34feb0092672d7bc4b233eaa99cf4dce06b7bd12 + blobstore_id: 1171d64c-e035-4262-8ba0-16c709215883 format-version: '2' diff --git a/.final_builds/packages/cfdot/index.yml b/.final_builds/packages/cfdot/index.yml index 059abd1ccd..ed2dbed2fa 100644 --- a/.final_builds/packages/cfdot/index.yml +++ b/.final_builds/packages/cfdot/index.yml @@ -132,4 +132,8 @@ builds: version: af63ed12b4569a03bfda64d9c473f359b69f7049 sha1: 2193311205824e4c1b7ac16287867f245c8cd18d blobstore_id: 30ec1ef6-50e5-49d4-b182-4961de5bd398 + dcfa79035c570c22eb57c27f79bf711688345e3a: + version: dcfa79035c570c22eb57c27f79bf711688345e3a + sha1: 5a61cc1d943c8493108db04f259807532e2cd021 + blobstore_id: 132a79ec-44f3-4c00-861a-7868a57aa8b5 format-version: '2' diff --git a/.final_builds/packages/diego-sshd/index.yml b/.final_builds/packages/diego-sshd/index.yml index 0c545dd7b1..84def6539f 100644 --- a/.final_builds/packages/diego-sshd/index.yml +++ b/.final_builds/packages/diego-sshd/index.yml @@ -560,4 +560,8 @@ builds: version: aa4552968bbe9591525d21dced6512e4e8cc4f45 sha1: 30370808c41c0b92a48b200de21c52abc5d16822 blobstore_id: 4e04b392-b270-4365-9d9a-3b05211852ed + e926fd1bd1da3bab5c78e530cfe68932c5831674: + version: e926fd1bd1da3bab5c78e530cfe68932c5831674 + sha1: b60e89c00a548834e9b8e9104541c191e8fc11c9 + blobstore_id: 70a4ee76-d544-4f1d-8b7f-b166d948083c format-version: '2' diff --git a/.final_builds/packages/healthcheck/index.yml b/.final_builds/packages/healthcheck/index.yml index 5c977370af..a340d9e207 100644 --- a/.final_builds/packages/healthcheck/index.yml +++ b/.final_builds/packages/healthcheck/index.yml @@ -60,4 +60,8 @@ builds: version: c553568996b76b4acd73fc48aed880524d678fe1 sha1: f026b048f5dc1b9c06ab52e10cf2ce32a27e6e77 blobstore_id: 06215bd6-277a-4e72-b6e3-e950ea82ed51 + 9cf72206a74667125ff277cc24635868e2dc2339: + version: 9cf72206a74667125ff277cc24635868e2dc2339 + sha1: e7cd74b0e081e771df08935ef06f2488e40b34e3 + blobstore_id: 38342952-df0c-4aa3-b1ca-9baae3d6e873 format-version: '2' diff --git a/.final_builds/packages/healthcheck_windows/index.yml b/.final_builds/packages/healthcheck_windows/index.yml index 527429c1b1..d06f429293 100644 --- a/.final_builds/packages/healthcheck_windows/index.yml +++ b/.final_builds/packages/healthcheck_windows/index.yml @@ -8,4 +8,8 @@ builds: version: 088377b44523b4149143756981af47db01dcac62 sha1: 7ca3956b7440a64024c58dce21750374f859be91 blobstore_id: 13aa87d3-392e-452e-8ba8-3ce74b3a45ce + b01597a98498c20b30f81668369bfc60c1f5fc74: + version: b01597a98498c20b30f81668369bfc60c1f5fc74 + sha1: ed4bc37bbd4bb169ac75a3717eeeb4e18145698d + blobstore_id: 4e4f6175-0e76-4222-8326-657dc9a0432b format-version: '2' diff --git a/.final_builds/packages/locket/index.yml b/.final_builds/packages/locket/index.yml index 68e77610dc..f7cceb24cb 100644 --- a/.final_builds/packages/locket/index.yml +++ b/.final_builds/packages/locket/index.yml @@ -72,4 +72,8 @@ builds: version: e2872bed2262fe1233a5d5178cf85d7cee9b7eeb sha1: ad69bd191e1293814b7b1953976d89ff59be5e13 blobstore_id: 64b7dd44-5606-4a10-a324-45ba3a8d6985 + f0327c8530f8dcf96930d35c0456149aa5ed63fe: + version: f0327c8530f8dcf96930d35c0456149aa5ed63fe + sha1: 24c0613a407b56a1d11d264b3dbd45a603258e8e + blobstore_id: 15a26644-cc59-441c-97c1-c9c28f13653f format-version: '2' diff --git a/.final_builds/packages/rep/index.yml b/.final_builds/packages/rep/index.yml index f82b363ee7..d520f0afad 100644 --- a/.final_builds/packages/rep/index.yml +++ b/.final_builds/packages/rep/index.yml @@ -1424,4 +1424,8 @@ builds: version: 5ef26ef1838746e7f10a8d8982a4f3f2e991b3de sha1: 58365493594015ade2c402b0bd65d56e6c104c7c blobstore_id: a7491660-83d3-4ddf-a728-45837b6d8398 + 48951016812411b17b1c62aa13ea1bf0f3f5479c: + version: 48951016812411b17b1c62aa13ea1bf0f3f5479c + sha1: 802f42740b63c239120ea2452ae51b78241c35d5 + blobstore_id: 3279a206-aba7-40ca-8f8d-acdce56e21be format-version: '2' diff --git a/.final_builds/packages/rep_windows/index.yml b/.final_builds/packages/rep_windows/index.yml index b32ea7936d..6ddb6a1a79 100644 --- a/.final_builds/packages/rep_windows/index.yml +++ b/.final_builds/packages/rep_windows/index.yml @@ -188,4 +188,8 @@ builds: version: ca67e1ccb5c9d85f3b7feee6539dd99f2d5787ce sha1: eccaf50be54e34173b17fba24e79c5b95a4ea081 blobstore_id: 4df2670b-4b0e-418c-95e3-a68bbed8f3e2 + 6e25144f764c7b4167a469234e50582847a28822: + version: 6e25144f764c7b4167a469234e50582847a28822 + sha1: 50caedd5a1343bce0013ec357ee998d9dfcf2184 + blobstore_id: 62ef7831-efbd-457c-82d2-c9bf78f7a485 format-version: '2' diff --git a/.final_builds/packages/route_emitter/index.yml b/.final_builds/packages/route_emitter/index.yml index abe2da7b98..e370b39dc3 100644 --- a/.final_builds/packages/route_emitter/index.yml +++ b/.final_builds/packages/route_emitter/index.yml @@ -1288,4 +1288,8 @@ builds: version: c922933b5007aa645c80f55e2a361781dcd9feb9 sha1: b4dd7aa82ed65dc4d0a6d82f3184f4adb1e2f036 blobstore_id: a632083a-274a-40ec-a017-74a4d788a0f4 + 1c654f8eb890ea8f0facc7a6cfba03772c7d337e: + version: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e + sha1: 7abadbc1eb972b2a0738b77d2ded0ea979c07494 + blobstore_id: 80af9f3f-81ec-46e6-8e3c-745ca6523530 format-version: '2' diff --git a/.final_builds/packages/route_emitter_windows/index.yml b/.final_builds/packages/route_emitter_windows/index.yml index beb3cbddae..4764a9fc48 100644 --- a/.final_builds/packages/route_emitter_windows/index.yml +++ b/.final_builds/packages/route_emitter_windows/index.yml @@ -104,4 +104,8 @@ builds: version: 869840921022639f9e8423c6f23546f36c793c0c sha1: 859a82461a40abc35415a80a2980e573957ff13c blobstore_id: fe0b6aef-7dc9-47b9-a53e-5d9dd1e735d3 + 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2: + version: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 + sha1: c0cc10917c7c2900f8ebe7e663810d280a8d333a + blobstore_id: 1debbe2c-9916-4de7-aa9a-baf558e9d841 format-version: '2' diff --git a/.final_builds/packages/ssh_proxy/index.yml b/.final_builds/packages/ssh_proxy/index.yml index 22815390dc..36d48ff073 100644 --- a/.final_builds/packages/ssh_proxy/index.yml +++ b/.final_builds/packages/ssh_proxy/index.yml @@ -520,4 +520,8 @@ builds: version: da45d1382da0eb7ffb94b4e8d2a09c7cc0fdcb16 sha1: 6bf0e6a36457edf244ebc2e0ba5cbb71fad8e8e6 blobstore_id: ca3a4469-fa29-4a96-a34d-7d40af3a78a0 + 3d37c0edadad1418071ba2d59231ab424fac6833: + version: 3d37c0edadad1418071ba2d59231ab424fac6833 + sha1: 0561aa0de62fb3b8ed8b63ad2514667756ea1848 + blobstore_id: 0a95865a-2044-4a8b-b687-35f30a3a0573 format-version: '2' diff --git a/.final_builds/packages/vizzini/index.yml b/.final_builds/packages/vizzini/index.yml index d1436d00fc..2cd9b2a08d 100644 --- a/.final_builds/packages/vizzini/index.yml +++ b/.final_builds/packages/vizzini/index.yml @@ -284,4 +284,8 @@ builds: version: 2f5711124bc1edd849c17ed788232392ee292ab8 sha1: 0363b4cae90cd166c2ae83cd76b86cd0294a020b blobstore_id: fab1937b-6311-443d-9ed6-9ab4acd71daf + fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b: + version: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b + sha1: a400ceb9966cd3bfc87f47f24ed1b9e47d38eab6 + blobstore_id: 19c7a372-4d91-4a9a-af72-96d3fe3eef45 format-version: '2' diff --git a/.final_builds/packages/windows_app_lifecycle/index.yml b/.final_builds/packages/windows_app_lifecycle/index.yml index 3e4c0024c2..1ecff6c23e 100644 --- a/.final_builds/packages/windows_app_lifecycle/index.yml +++ b/.final_builds/packages/windows_app_lifecycle/index.yml @@ -104,4 +104,8 @@ builds: version: cdb1be38851badbbf5df9c4d15c197de2d01b9bf sha1: c9864aa47bd1d6bd9158d046b57b66647f72acdd blobstore_id: aab3af1b-c193-48a7-8a66-bb4ede496224 + b611468c8a02374fd18609608bf8703519a23aa4: + version: b611468c8a02374fd18609608bf8703519a23aa4 + sha1: 09a5fcc7d73a7f8af73715cf634076a1ca4264d2 + blobstore_id: a998de22-6c43-4cf4-b039-4a27e5d6badd format-version: '2' diff --git a/releases/diego-1.22.0.yml b/releases/diego-1.22.0.yml new file mode 100644 index 0000000000..a7f9886df2 --- /dev/null +++ b/releases/diego-1.22.0.yml @@ -0,0 +1,187 @@ +--- +packages: +- name: auctioneer + version: 20545141cea1e9edbcf2886587a373df85ac896f + fingerprint: 20545141cea1e9edbcf2886587a373df85ac896f + sha1: 957ab48788b0ef3c5237d3b76b95e84b4104d512 + dependencies: + - golang +- name: bbs + version: ec864334278588163141f484a045c88802e04724 + fingerprint: ec864334278588163141f484a045c88802e04724 + sha1: cf71eafe7a5d0c4a4fdb390488c135487a0d35c1 + dependencies: + - golang +- name: benchmark-bbs + version: cc173e1d081296ba1aa2c2e63f8788032868d48d + fingerprint: cc173e1d081296ba1aa2c2e63f8788032868d48d + sha1: 34feb0092672d7bc4b233eaa99cf4dce06b7bd12 + dependencies: + - golang +- name: buildpack_app_lifecycle + version: 5689eeb118926f586e15bffd8b58bb1b3c0f223c + fingerprint: 5689eeb118926f586e15bffd8b58bb1b3c0f223c + sha1: 3d847899504df650ca4df6b6202a336b7c4a04ea + dependencies: + - diego-sshd + - golang + - healthcheck +- name: cfdot + version: dcfa79035c570c22eb57c27f79bf711688345e3a + fingerprint: dcfa79035c570c22eb57c27f79bf711688345e3a + sha1: 5a61cc1d943c8493108db04f259807532e2cd021 + dependencies: + - golang +- name: diego-sshd + version: e926fd1bd1da3bab5c78e530cfe68932c5831674 + fingerprint: e926fd1bd1da3bab5c78e530cfe68932c5831674 + sha1: b60e89c00a548834e9b8e9104541c191e8fc11c9 + dependencies: + - golang +- name: docker_app_lifecycle + version: f87324f504027becdb6f931da090264713ad0086 + fingerprint: f87324f504027becdb6f931da090264713ad0086 + sha1: 25bbc31eec8699c81e97dea749fd5b0ae29b68be + dependencies: + - diego-sshd + - golang + - healthcheck +- name: file_server + version: acc0f630405c5bc158cb2e15895f2e11a6cd03ee + fingerprint: acc0f630405c5bc158cb2e15895f2e11a6cd03ee + sha1: 9f5dcf24bca69106015371f05a0f6fb1b1789fca + dependencies: + - golang +- name: golang-windows + version: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 + fingerprint: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 + sha1: bd627bc213dd1d2c207ce469540c8c915139fcc0 + dependencies: [] +- name: golang + version: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 + fingerprint: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 + sha1: 958c65e49f9457ecc08f028a1aea3c94651eada6 + dependencies: [] +- name: healthcheck + version: 9cf72206a74667125ff277cc24635868e2dc2339 + fingerprint: 9cf72206a74667125ff277cc24635868e2dc2339 + sha1: e7cd74b0e081e771df08935ef06f2488e40b34e3 + dependencies: + - golang +- name: healthcheck_windows + version: b01597a98498c20b30f81668369bfc60c1f5fc74 + fingerprint: b01597a98498c20b30f81668369bfc60c1f5fc74 + sha1: ed4bc37bbd4bb169ac75a3717eeeb4e18145698d + dependencies: + - golang-windows +- name: locket + version: f0327c8530f8dcf96930d35c0456149aa5ed63fe + fingerprint: f0327c8530f8dcf96930d35c0456149aa5ed63fe + sha1: 24c0613a407b56a1d11d264b3dbd45a603258e8e + dependencies: + - golang +- name: pid_utils + version: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 + fingerprint: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 + sha1: 6ada005648f7f631cd9fef1685574e27be88c913 + dependencies: [] +- name: rep + version: 48951016812411b17b1c62aa13ea1bf0f3f5479c + fingerprint: 48951016812411b17b1c62aa13ea1bf0f3f5479c + sha1: 802f42740b63c239120ea2452ae51b78241c35d5 + dependencies: + - golang +- name: rep_windows + version: 6e25144f764c7b4167a469234e50582847a28822 + fingerprint: 6e25144f764c7b4167a469234e50582847a28822 + sha1: 50caedd5a1343bce0013ec357ee998d9dfcf2184 + dependencies: + - golang-windows +- name: route_emitter + version: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e + fingerprint: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e + sha1: 7abadbc1eb972b2a0738b77d2ded0ea979c07494 + dependencies: + - golang +- name: route_emitter_windows + version: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 + fingerprint: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 + sha1: c0cc10917c7c2900f8ebe7e663810d280a8d333a + dependencies: + - golang-windows +- name: ssh_proxy + version: 3d37c0edadad1418071ba2d59231ab424fac6833 + fingerprint: 3d37c0edadad1418071ba2d59231ab424fac6833 + sha1: 0561aa0de62fb3b8ed8b63ad2514667756ea1848 + dependencies: + - golang +- name: vizzini + version: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b + fingerprint: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b + sha1: a400ceb9966cd3bfc87f47f24ed1b9e47d38eab6 + dependencies: + - golang +- name: windows_app_lifecycle + version: b611468c8a02374fd18609608bf8703519a23aa4 + fingerprint: b611468c8a02374fd18609608bf8703519a23aa4 + sha1: 09a5fcc7d73a7f8af73715cf634076a1ca4264d2 + dependencies: + - diego-sshd + - healthcheck +jobs: +- name: auctioneer + version: bd357fda056ec0f2edf29f0c9183dde36af99a93 + fingerprint: bd357fda056ec0f2edf29f0c9183dde36af99a93 + sha1: affecabafe4f1273c34a6d9a6d70353a08158969 +- name: bbs + version: cafe0e5eff944f26b960006a835356304e02f9e2 + fingerprint: cafe0e5eff944f26b960006a835356304e02f9e2 + sha1: bfdfdc67aa0266ba90ba95c4e3462d3d0b85cea0 +- name: benchmark-bbs + version: e023423f093d3ce5be53bbce30b4823852506078 + fingerprint: e023423f093d3ce5be53bbce30b4823852506078 + sha1: 8748824ae24919bed064ee1cda208b993b52a6fb +- name: cfdot + version: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 + fingerprint: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 + sha1: ec3a4f1ef05c1638d4e4f12fe630a34d27e9fc4d +- name: file_server + version: de829eb0408806028a4010c6018f3e87b5190c05 + fingerprint: de829eb0408806028a4010c6018f3e87b5190c05 + sha1: 30bcef30b16d1445dc7e6b92dc4c7a015f5975e5 +- name: locket + version: f4f379943bab0f5fa0a9727d82b91760eb52a81e + fingerprint: f4f379943bab0f5fa0a9727d82b91760eb52a81e + sha1: 8b964808937f54c50c684506d7d89d84e5270b2c +- name: rep + version: 40bec4155435ff4f93a09be9e68117b0302e4ae1 + fingerprint: 40bec4155435ff4f93a09be9e68117b0302e4ae1 + sha1: f1a43af2fbf4c86589ba9db52a97d8c808704c8e +- name: rep_windows + version: 51f58a23232c83708338d65b76ce141c9ee62083 + fingerprint: 51f58a23232c83708338d65b76ce141c9ee62083 + sha1: af3253f303d17bcbdc91c551d65096d4648a6b56 +- name: route_emitter + version: 7252da78169a5bc463bdeee2d946a3aacd15dd44 + fingerprint: 7252da78169a5bc463bdeee2d946a3aacd15dd44 + sha1: eb7f90768dbec774ffa9f60126ca6225d8dff5db +- name: route_emitter_windows + version: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 + fingerprint: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 + sha1: 9021e27b20a00503409e1723616c0fef301c639d +- name: ssh_proxy + version: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d + fingerprint: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d + sha1: bd2649784bd2db2b62f4217bd48cf2e6f3307184 +- name: vizzini + version: 6b951848a1d8095e11cc360956a001aeae97a345 + fingerprint: 6b951848a1d8095e11cc360956a001aeae97a345 + sha1: 0b06815364973f67a988658f4776bb7eb1c3d8d0 +license: + version: e5665430b5aafd47589f9df4e2345684d3924831 + fingerprint: e5665430b5aafd47589f9df4e2345684d3924831 + sha1: 3dbb1fe81392fb1ff3a58cbaa3f7e05b6980e6b3 +commit_hash: bf03b7f2 +uncommitted_changes: false +name: diego +version: 1.22.0 diff --git a/releases/index.yml b/releases/index.yml index 619ead2fd0..04a2f1c5c0 100644 --- a/releases/index.yml +++ b/releases/index.yml @@ -1302,4 +1302,6 @@ builds: version: 1.20.0 02b5f1f8-14da-4720-a983-3cefa490ec8d: version: 1.21.0 + 42025cd2-b2a2-4344-91e3-b145aeb8eb4d: + version: 1.22.0 format-version: '2' From 516c4dfd159e0929215c31b02ddee02d5fb2f2dd Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Wed, 12 Jul 2017 13:24:27 -0400 Subject: [PATCH 04/37] bump diego-ssh Submodule src/code.cloudfoundry.org/diego-ssh 19d2baa7..e1e411df: > Merge branch 'keep-this-branch' Signed-off-by: John Shahid --- src/code.cloudfoundry.org/diego-ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/diego-ssh b/src/code.cloudfoundry.org/diego-ssh index 19d2baa79e..e1e411dfa6 160000 --- a/src/code.cloudfoundry.org/diego-ssh +++ b/src/code.cloudfoundry.org/diego-ssh @@ -1 +1 @@ -Subproject commit 19d2baa79e67e54edc465e3502bc5eeea8f22367 +Subproject commit e1e411dfa6dbcd6c378817914ca84e3f3fa72817 From 5f2c5c55761fef20c37ce5ca53a079bd1a68b59e Mon Sep 17 00:00:00 2001 From: John Shahid Date: Wed, 12 Jul 2017 14:34:15 -0400 Subject: [PATCH 05/37] install the git hooks after all submodules have been initialized Signed-off-by: Swetha Repakula --- scripts/update | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/update b/scripts/update index 07821481b2..1430aa23dd 100755 --- a/scripts/update +++ b/scripts/update @@ -15,9 +15,6 @@ function has_upstream() { set -x -e scripts_dir="$(cd $(dirname $0) && pwd)" -if [ -d "$(dirname "$scripts_dir")/.git" ] ; then - "$scripts_dir"/install-git-hooks -fi has_upstream && git pull @@ -27,3 +24,6 @@ else git submodule sync --recursive && git submodule foreach --recursive git submodule sync && git submodule update --init --recursive fi +if [ -d "$(dirname "$scripts_dir")/.git" ] ; then + "$scripts_dir"/install-git-hooks +fi From 10396f5257603fe409b3b82f7f64fe3f77828847 Mon Sep 17 00:00:00 2001 From: Anoop Gopalakrishnan Date: Wed, 12 Jul 2017 11:49:57 -0700 Subject: [PATCH 06/37] bump buildpackapplifecycle diego-ssh dockerapplifecycle [finishes #148020689] Submodule src/code.cloudfoundry.org/buildpackapplifecycle 554a15cd..4bad9b68: > [#148020689] sets the GOMAXPROCS to 1 > Merge pull request #18 from greenhouse-org/fix-skip-detect > Confirm old cache structure removal > Rename cache "primary" to "final" > Revert "Revert "Prefer bin/finalize to bin/compile"" > Revert "Prefer bin/finalize to bin/compile" > Prefer bin/finalize to bin/compile Submodule src/code.cloudfoundry.org/diego-ssh e1e411df..d0a23d38: > [ #148020689 ] sets the GOMAXPROCS to 1 Submodule src/code.cloudfoundry.org/dockerapplifecycle 574621fb..6c11c768: > [#148020689] sets the GOMAXPROCS to 1 Signed-off-by: Danny Cao --- src/code.cloudfoundry.org/buildpackapplifecycle | 2 +- src/code.cloudfoundry.org/diego-ssh | 2 +- src/code.cloudfoundry.org/dockerapplifecycle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/code.cloudfoundry.org/buildpackapplifecycle b/src/code.cloudfoundry.org/buildpackapplifecycle index 554a15cdf2..4bad9b686c 160000 --- a/src/code.cloudfoundry.org/buildpackapplifecycle +++ b/src/code.cloudfoundry.org/buildpackapplifecycle @@ -1 +1 @@ -Subproject commit 554a15cdf273fa9781b0e4d5379e72886ca280f6 +Subproject commit 4bad9b686c3d00ece7872bde278997321d1aef7d diff --git a/src/code.cloudfoundry.org/diego-ssh b/src/code.cloudfoundry.org/diego-ssh index e1e411dfa6..d0a23d3864 160000 --- a/src/code.cloudfoundry.org/diego-ssh +++ b/src/code.cloudfoundry.org/diego-ssh @@ -1 +1 @@ -Subproject commit e1e411dfa6dbcd6c378817914ca84e3f3fa72817 +Subproject commit d0a23d38644b8f2206d0c4a5448c768f7f05eee5 diff --git a/src/code.cloudfoundry.org/dockerapplifecycle b/src/code.cloudfoundry.org/dockerapplifecycle index 574621fb46..6c11c768fa 160000 --- a/src/code.cloudfoundry.org/dockerapplifecycle +++ b/src/code.cloudfoundry.org/dockerapplifecycle @@ -1 +1 @@ -Subproject commit 574621fb46ed8b4ff9c421257a1a2f783531b4e2 +Subproject commit 6c11c768fa6f5a77f2ab53c820040e9ab87f9c1b From d09f02bb3b07c6ed362538c74371e96223b4d31a Mon Sep 17 00:00:00 2001 From: Danny Cao Date: Wed, 12 Jul 2017 11:52:52 -0700 Subject: [PATCH 07/37] bump executor [finishes #148612845] Submodule src/code.cloudfoundry.org/executor 38219913..cacbba59: > [#148612845] Only shows one out of memory message from events for the app Signed-off-by: Anoop Gopalakrishnan --- src/code.cloudfoundry.org/executor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/executor b/src/code.cloudfoundry.org/executor index 38219913ff..cacbba590d 160000 --- a/src/code.cloudfoundry.org/executor +++ b/src/code.cloudfoundry.org/executor @@ -1 +1 @@ -Subproject commit 38219913ffd571bd5f66da45560883cad764cd97 +Subproject commit cacbba590df1953bae3b49499b2cc80cc7f051ac From 0c060ce36f90d581b42c2edeb05e0a67046c4a61 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Wed, 12 Jul 2017 17:16:48 -0400 Subject: [PATCH 08/37] Generate minimal cloud-config for use with cf-mysql-deployment [#148322889] Signed-off-by: Swetha Repakula --- examples/aws/deploy_aws_environment | 8 ++ .../infrastructure/cloud-config-internal.yml | 98 +++++++++++++++++++ .../templates/infrastructure/cloud-config.yml | 7 ++ 3 files changed, 113 insertions(+) create mode 100644 examples/aws/templates/infrastructure/cloud-config-internal.yml create mode 100644 examples/aws/templates/infrastructure/cloud-config.yml diff --git a/examples/aws/deploy_aws_environment b/examples/aws/deploy_aws_environment index 077add7242..d853270d4a 100755 --- a/examples/aws/deploy_aws_environment +++ b/examples/aws/deploy_aws_environment @@ -360,6 +360,7 @@ fi mkdir -p stubs/diego mkdir -p stubs/diego-windows +mkdir -p stubs/routing # generate Diego property-override stub with certs if [ -f stubs/diego/property-overrides.yml ]; then @@ -411,6 +412,13 @@ spiff merge \ stubs/aws-resources.yml \ > stubs/cf-mysql/iaas-settings.yml +# generate cloud config stub +spiff merge \ + $SCRIPT_DIR/templates/infrastructure/cloud-config.yml \ + $SCRIPT_DIR/templates/infrastructure/cloud-config-internal.yml \ + stubs/aws-resources.yml \ + > stubs/cloud-config.yml + # generate datadog firehose nozzle manifest if the user stubs exist if [ -d stubs/datadog-firehose-nozzle ]; then spiff merge \ diff --git a/examples/aws/templates/infrastructure/cloud-config-internal.yml b/examples/aws/templates/infrastructure/cloud-config-internal.yml new file mode 100644 index 0000000000..27277ef3bd --- /dev/null +++ b/examples/aws/templates/infrastructure/cloud-config-internal.yml @@ -0,0 +1,98 @@ +azs: +- name: z1 + cloud_properties: + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) +- name: z2 + cloud_properties: + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) +- name: z3 + cloud_properties: + availability_zone: us-east-1a + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ3 )) + +vm_types: +- name: database + cloud_properties: + instance_type: c3.4xlarge +- name: proxy + cloud_properties: + instance_type: c3.2xlarge +- name: arbitrator + cloud_properties: + instance_type: t2.micro +- name: errand + cloud_properties: + instance_type: m3.large +- name: compilation + cloud_properties: + instance_type: c4.large + ephemeral_disk: + size: 30000 + type: gp2 +disk_types: +- cloud_properties: + iops: 2000 + type: io1 + disk_size: 100000 + name: mysql-persistent-disk + +compilation: + workers: 4 + network: default + az: z1 + reuse_compilation_vms: true + vm_type: compilation + +networks: +- name: default + subnets: + - az: z1 + range: (( Resources.SubnetCIDR.MySQLZ1 )) + reserved: + - (( Resources.SubnetOctets.MySQLZ1.[2] ".2 - " Resources.SubnetOctets.MySQLZ1.[2] ".9" )) + - (( Resources.SubnetOctets.MySQLZ1.[2] ".130 - " Resources.SubnetOctets.MySQLZ1.[2] ".254" )) + static: (( [Resources.SubnetOctets.MySQLZ1.[2] ".10 - " Resources.SubnetOctets.MySQLZ1.[2] ".63"] )) + gateway: (( Resources.SubnetOctets.MySQLZ1.[2] ".1" )) + dns: (( [Resources.SubnetOctets.MySQLZ1.[1] ".0.2"] )) + cloud_properties: + subnet: (( Resources.Subnet.MySQLZ1 )) + - az: z2 + range: (( Resources.SubnetCIDR.MySQLZ2 )) + reserved: + - (( Resources.SubnetOctets.MySQLZ2.[2] ".2 - " Resources.SubnetOctets.MySQLZ2.[2] ".9" )) + - (( Resources.SubnetOctets.MySQLZ2.[2] ".130 - " Resources.SubnetOctets.MySQLZ2.[2] ".254" )) + static: (( [Resources.SubnetOctets.MySQLZ2.[2] ".10 - " Resources.SubnetOctets.MySQLZ2.[2] ".63"] )) + gateway: (( Resources.SubnetOctets.MySQLZ2.[2] ".1" )) + dns: (( [Resources.SubnetOctets.MySQLZ2.[1] ".0.2"] )) + cloud_properties: + subnet: (( Resources.Subnet.MySQLZ2 )) + - az: z3 + range: (( Resources.SubnetCIDR.MySQLZ3 )) + reserved: + - (( Resources.SubnetOctets.MySQLZ3.[2] ".2 - " Resources.SubnetOctets.MySQLZ3.[2] ".9" )) + - (( Resources.SubnetOctets.MySQLZ3.[2] ".130 - " Resources.SubnetOctets.MySQLZ3.[2] ".254" )) + static: (( [Resources.SubnetOctets.MySQLZ3.[2] ".10 - " Resources.SubnetOctets.MySQLZ3.[2] ".63"] )) + gateway: (( Resources.SubnetOctets.MySQLZ3.[2] ".1" )) + dns: (( [Resources.SubnetOctets.MySQLZ3.[1] ".0.2"] )) + cloud_properties: + subnet: (( Resources.Subnet.MySQLZ3 )) + +#################################################### + +Resources: + Subnet: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SubnetAvailabilityZone: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SubnetOctets: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SubnetCIDR: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) diff --git a/examples/aws/templates/infrastructure/cloud-config.yml b/examples/aws/templates/infrastructure/cloud-config.yml new file mode 100644 index 0000000000..56f6738068 --- /dev/null +++ b/examples/aws/templates/infrastructure/cloud-config.yml @@ -0,0 +1,7 @@ +--- +azs: (( merge )) +disk_types: (( merge )) +vm_types: (( merge )) +compilation: (( merge )) +networks: (( merge )) +networks: (( merge )) From 366511bbceae5396208f447ec35774893489dd83 Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Wed, 12 Jul 2017 17:58:18 -0400 Subject: [PATCH 09/37] bump auctioneer bbs inigo [finishes #147786737] Submodule src/code.cloudfoundry.org/auctioneer 98f10e6..82492a5: > add UUID configuration and use as locket owner Submodule src/code.cloudfoundry.org/bbs 54192ca..4b8d8ef: > Add UUID attribute to BBS configuration. Submodule src/code.cloudfoundry.org/inigo 1457724..fc9ddf5: > add UUIDs for BBS and auctioneer Signed-off-by: Brandon Shroyer --- jobs/auctioneer/templates/auctioneer.json.erb | 1 + jobs/bbs/templates/bbs.json.erb | 1 + src/code.cloudfoundry.org/auctioneer | 2 +- src/code.cloudfoundry.org/bbs | 2 +- src/code.cloudfoundry.org/inigo | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index e8c39b9b31..f9ba1af775 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -45,6 +45,7 @@ if_p("diego.auctioneer.locket.api_location") do |value| config[:locket_address] = value + config[:uuid] = spec.id config[:locket_ca_cert_file] = "#{CONF_DIR}/certs/bbs/ca.crt" config[:locket_client_cert_file] = "#{CONF_DIR}/certs/bbs/client.crt" config[:locket_client_key_file] = "#{CONF_DIR}/certs/bbs/client.key" diff --git a/jobs/bbs/templates/bbs.json.erb b/jobs/bbs/templates/bbs.json.erb index 515df48b4a..4ee45e79d3 100644 --- a/jobs/bbs/templates/bbs.json.erb +++ b/jobs/bbs/templates/bbs.json.erb @@ -174,6 +174,7 @@ if_p("diego.bbs.locket.api_location") do |value| config[:locket_address] = value + config[:uuid] = spec.id config[:locket_ca_cert_file] = "#{CONF_DIR}/certs/ca.crt" config[:locket_client_cert_file] = "#{CONF_DIR}/certs/server.crt" config[:locket_client_key_file] = "#{CONF_DIR}/certs/server.key" diff --git a/src/code.cloudfoundry.org/auctioneer b/src/code.cloudfoundry.org/auctioneer index 98f10e6819..82492a50b3 160000 --- a/src/code.cloudfoundry.org/auctioneer +++ b/src/code.cloudfoundry.org/auctioneer @@ -1 +1 @@ -Subproject commit 98f10e68199fdeec15157198b59affee7b5b554a +Subproject commit 82492a50b3f3fae9a8408f3dc5f66578dfccd8d4 diff --git a/src/code.cloudfoundry.org/bbs b/src/code.cloudfoundry.org/bbs index 54192cae0e..4b8d8ef310 160000 --- a/src/code.cloudfoundry.org/bbs +++ b/src/code.cloudfoundry.org/bbs @@ -1 +1 @@ -Subproject commit 54192cae0e835f9b4d6026625ec3377645e18271 +Subproject commit 4b8d8ef310decf180b3c3132aa288c2e571ce970 diff --git a/src/code.cloudfoundry.org/inigo b/src/code.cloudfoundry.org/inigo index 145772431b..fc9ddf54b3 160000 --- a/src/code.cloudfoundry.org/inigo +++ b/src/code.cloudfoundry.org/inigo @@ -1 +1 @@ -Subproject commit 145772431b887d6ca03b72af14a8f8062ff063d5 +Subproject commit fc9ddf54b3ad8084171a98f0c8bd654ca663eb5f From 8ba0b96831f8a8ec6a74e73aee750bb0f5fb3fcd Mon Sep 17 00:00:00 2001 From: John Shahid Date: Thu, 13 Jul 2017 11:28:15 -0400 Subject: [PATCH 10/37] bump mysql [finishes #147786839] Submodule src/github.com/go-sql-driver/mysql 66312f7f..19845115: > Merge remote-tracking branch 'origin/pr/631' > Start the watcher after handshake (#627) > utils: guard tlsConfigRegister by a lock (#613) > Transaction isolation levels (#619) > packets: use AppendFormat to format time values (#615) > Add atomic wrappers for bool and error (#612) > Add support for context.Context (#608) > Add missing copyright header (#603) > add rejectReadOnly option (to fix AWS Aurora failover) (#604) > utils: don't mutate registered tls configs (#600) > Avoid allocating on each call to rows.Columns (#444) > remove columns definition cache. (#592) > infile: fix reading from empty file (#590) > travis: submit coverage to coveralls (#589) > packets: remove unnecessary conversion from float32 to float32 (#581) > packets: replace repeated if/else if by switch (#580) > fix typos (#579) > travis: check go vet and gofmt (#577) > args assigned and not used (#575) > Use hostname from DSN as default for TLS if tls=true (#564) > Format AUTHORS (#574) > doc: fix synopsis for godoc (#567) > Fix documentation for timeout parameters (#535) > travis: Add MySQL 5.7 and MariaDB tests. (#560) > travis: add Go 1.8 test (#557) > Add Multi-Results support (#537) > Fix many urls (#530) > Add author name (#530) (#534) > Release v1.3 (#517) > Fix old_password authentication via OldAuthSwitchRequest (#524) > Move GitHub templates to .github/ (#522) > packets: Allow terminating packets of length 0 (#516) > rows: Invalidate connection on error in discardResults() (#513) > statment: Remove invalid connection error on multiple Close calls (#512) > README: document DSN system var quoting rules (#502) > Support authentication switch with mysql_native_password authentication (#494) > Update CHANGELOG > README: Sort variables alphabetically > README: Clarify strict mode (#500) > Add maxAllowedPacket DSN Parameter > README: Include Difference in Connection Strings depending on Cloud SQL Generation > add comment > fixup > Fix index out of range in interpolateParams. > Add test to reproduce #467 > travis.yml: Test with Go 1.7 > Merge pull request #473 from methane/fix-464 > Merge pull request #459 from dsnet/master > Merge pull request #434 from pib/fix_float_with_placeholder > Revert "Merge pull request #350 from dveeden/connattrs_v4" > Merge pull request #350 from dveeden/connattrs_v4 --- .gitmodules | 2 +- src/github.com/go-sql-driver/mysql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bdf5081d95..37d30d2fd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -149,7 +149,7 @@ url = https://github.com/pkg/sftp [submodule "src/github.com/go-sql-driver/mysql"] path = src/github.com/go-sql-driver/mysql - url = https://github.com/go-sql-driver/mysql + url = https://github.com/cloudfoundry/mysql [submodule "src/github.com/lib/pq"] path = src/github.com/lib/pq url = https://github.com/lib/pq diff --git a/src/github.com/go-sql-driver/mysql b/src/github.com/go-sql-driver/mysql index 66312f7fe2..198451155c 160000 --- a/src/github.com/go-sql-driver/mysql +++ b/src/github.com/go-sql-driver/mysql @@ -1 +1 @@ -Subproject commit 66312f7fe2678aa0f5ec770f96702f4c4ec5aa8e +Subproject commit 198451155c14185d6f77f22a5cfd8050087073f3 From 54f998c20700d4a1302567f665bbd9f262fecfad Mon Sep 17 00:00:00 2001 From: John Shahid Date: Thu, 13 Jul 2017 12:31:42 -0400 Subject: [PATCH 11/37] Make max_cache_size_in_bytes configurable on windows cells We need to lower the windows cells cache size to avoid running out of disk space. According to the #greenhouse team, it is not possible to increase the root disk size (on AWS). Currently windows is taking around 15G and the cache is about 8G which leaves little room for apps to run. --- manifest-generation/diego-windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest-generation/diego-windows.yml b/manifest-generation/diego-windows.yml index cfc6ba6ef3..4a06d9aa52 100644 --- a/manifest-generation/diego-windows.yml +++ b/manifest-generation/diego-windows.yml @@ -205,7 +205,8 @@ properties: client_key: (( property_overrides.rep.consul.client_key || nil )) locket: api_location: (( sql_lock_overrides.locket.api_location )) - + executor: + max_cache_size_in_bytes: (( property_overrides.executor.max_cache_size_in_bytes || nil )) route_emitter: dropsonde_port: (( config_from_cf.metron_agent.dropsonde_incoming_port )) bbs: From 788f6d0f67098c9f6f3002ed017e9990708c4592 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Thu, 13 Jul 2017 12:37:39 -0400 Subject: [PATCH 12/37] bump bbs Submodule src/code.cloudfoundry.org/bbs 4b8d8ef3..3e6bf35e: > wait for the bbs to start and assert that we don't get an error --- src/code.cloudfoundry.org/bbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/bbs b/src/code.cloudfoundry.org/bbs index 4b8d8ef310..3e6bf35e14 160000 --- a/src/code.cloudfoundry.org/bbs +++ b/src/code.cloudfoundry.org/bbs @@ -1 +1 @@ -Subproject commit 4b8d8ef310decf180b3c3132aa288c2e571ce970 +Subproject commit 3e6bf35e1414c8f13507e70014e3532dea300f05 From 4381a42693c0d9c8a670a5722a13487c7ad46ae7 Mon Sep 17 00:00:00 2001 From: Swetha Repakula Date: Wed, 12 Jul 2017 17:44:45 -0700 Subject: [PATCH 13/37] bump cfdot [finishes #147532949] Submodule src/code.cloudfoundry.org/cfdot 7652a61..677ecc7: > Add task events --- src/code.cloudfoundry.org/cfdot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/cfdot b/src/code.cloudfoundry.org/cfdot index 7652a61247..677ecc77c1 160000 --- a/src/code.cloudfoundry.org/cfdot +++ b/src/code.cloudfoundry.org/cfdot @@ -1 +1 @@ -Subproject commit 7652a61247f5485c79df33717715b86c8d7b04f0 +Subproject commit 677ecc77c1640008b1d7a7cb944ff48e9ea6cab2 From d72757541ff5b6857c27d00567680a14fc3267da Mon Sep 17 00:00:00 2001 From: Swetha Repakula Date: Thu, 13 Jul 2017 10:51:33 -0700 Subject: [PATCH 14/37] bump lager [finishes #148086299] Submodule src/code.cloudfoundry.org/lager dfcbcba..438ab98: > update import locations in README --- src/code.cloudfoundry.org/lager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/lager b/src/code.cloudfoundry.org/lager index dfcbcba2dd..438ab98cc3 160000 --- a/src/code.cloudfoundry.org/lager +++ b/src/code.cloudfoundry.org/lager @@ -1 +1 @@ -Subproject commit dfcbcba2dd4a5228c43b0292d219d5c010daed3a +Subproject commit 438ab98cc3b9b81e97c2281422b2722cd8e80ed8 From 01807d83de950191516129841668d256203e4b21 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Thu, 13 Jul 2017 17:30:20 -0400 Subject: [PATCH 15/37] bump bbs go-loggregator [finishes #141115729] Submodule src/code.cloudfoundry.org/bbs 3e6bf35e..928ed12f: > Merge remote-tracking branch 'origin/bbs-metrics-141115729' Submodule src/code.cloudfoundry.org/go-loggregator b1525c9a..1c991136: > Remove golang.org/x/net submodule > Merge pull request #12 from anoop2811/master > Merge pull request #15 from apoydence/add-all-vendors > Merge pull request #13 from apoydence/add-badges > Add example of using v1 client > Add origin to v1 client envelopes > Merge pull request #11 from cloudfoundry-incubator/add-v1-client-with-v2-interface > Add pulse emitter from scalable syslog > Adds RawIngressClient --- jobs/bbs/spec | 16 +++++++++ jobs/bbs/templates/bbs.json.erb | 14 ++++++++ jobs/bbs/templates/loggregator_ca.crt.erb | 4 +++ jobs/bbs/templates/loggregator_client.crt.erb | 3 ++ jobs/bbs/templates/loggregator_client.key.erb | 4 +++ packages/bbs/spec | 24 +++++++++++++ packages/benchmark-bbs/spec | 36 +++++++++++++++++++ packages/rep/spec | 4 ++- packages/rep_windows/spec | 4 ++- src/code.cloudfoundry.org/bbs | 2 +- src/code.cloudfoundry.org/go-loggregator | 2 +- 11 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 jobs/bbs/templates/loggregator_ca.crt.erb create mode 100644 jobs/bbs/templates/loggregator_client.crt.erb create mode 100644 jobs/bbs/templates/loggregator_client.key.erb diff --git a/jobs/bbs/spec b/jobs/bbs/spec index a7b173a09e..38411eee6e 100644 --- a/jobs/bbs/spec +++ b/jobs/bbs/spec @@ -20,6 +20,9 @@ templates: auctioneer_ca.crt.erb: config/certs/auctioneer/ca.crt auctioneer_client.crt.erb: config/certs/auctioneer/client.crt auctioneer_client.key.erb: config/certs/auctioneer/client.key + loggregator_ca.crt.erb: config/certs/loggregator/ca.crt + loggregator_client.crt.erb: config/certs/loggregator/client.crt + loggregator_client.key.erb: config/certs/loggregator/client.key packages: - pid_utils @@ -159,3 +162,16 @@ properties: diego.bbs.skip_consul_lock: default: false description: "EXPERIMENTAL: true to skip consul lock. locket.api_location must be set" + + loggregator.use_v2_api: + description: "True to use local metron agent gRPC v2 api. False, to use UDP v1 api" + default: false + loggregator.v2_api_port: + description: "Local metron agent gRPC port" + default: 3458 + loggregator.ca_cert: + description: "CA Cert used to communicate with local metron agent over gRPC" + loggregator.cert: + description: "Cert used to communicate with local metron agent over gRPC" + loggregator.key: + description: "Key used to communicate with local metron agent over gRPC" diff --git a/jobs/bbs/templates/bbs.json.erb b/jobs/bbs/templates/bbs.json.erb index 4ee45e79d3..d5b78f5b9f 100644 --- a/jobs/bbs/templates/bbs.json.erb +++ b/jobs/bbs/templates/bbs.json.erb @@ -184,5 +184,19 @@ config[:skip_consul_lock] = skip_consul_lock end + config[:loggregator]={} + config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api") + if p("loggregator.use_v2_api") == true + config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port") + config[:loggregator][:loggregator_ca_path] = "#{CONF_DIR}/certs/loggregator/ca.crt" + config[:loggregator][:loggregator_cert_path] = "#{CONF_DIR}/certs/loggregator/client.crt" + config[:loggregator][:loggregator_key_path] = "#{CONF_DIR}/certs/loggregator/client.key" + config[:loggregator][:loggregator_job_deployment] = spec.deployment + config[:loggregator][:loggregator_job_name] = spec.name + config[:loggregator][:loggregator_job_index] = spec.id + config[:loggregator][:loggregator_job_ip] = spec.address + config[:loggregator][:loggregator_job_origin] = "bbs" + end + config.to_json %> diff --git a/jobs/bbs/templates/loggregator_ca.crt.erb b/jobs/bbs/templates/loggregator_ca.crt.erb new file mode 100644 index 0000000000..150228f869 --- /dev/null +++ b/jobs/bbs/templates/loggregator_ca.crt.erb @@ -0,0 +1,4 @@ +<% if_p("loggregator.ca_cert") do |value| %> +<%= value %> +<% end %> + diff --git a/jobs/bbs/templates/loggregator_client.crt.erb b/jobs/bbs/templates/loggregator_client.crt.erb new file mode 100644 index 0000000000..725c7bc0de --- /dev/null +++ b/jobs/bbs/templates/loggregator_client.crt.erb @@ -0,0 +1,3 @@ +<% if_p("loggregator.cert") do |value| %> +<%= value %> +<% end %> diff --git a/jobs/bbs/templates/loggregator_client.key.erb b/jobs/bbs/templates/loggregator_client.key.erb new file mode 100644 index 0000000000..c71c6d51f2 --- /dev/null +++ b/jobs/bbs/templates/loggregator_client.key.erb @@ -0,0 +1,4 @@ +<% if_p("loggregator.key") do |value| %> +<%= value %> +<% end %> + diff --git a/packages/bbs/spec b/packages/bbs/spec index 7d9d84fb80..97e83e00b2 100644 --- a/packages/bbs/spec +++ b/packages/bbs/spec @@ -36,6 +36,30 @@ files: - code.cloudfoundry.org/debugserver/*.go # gosub - code.cloudfoundry.org/durationjson/*.go # gosub - code.cloudfoundry.org/executor/*.go # gosub + - code.cloudfoundry.org/go-loggregator/*.go # gosub + - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub + - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub + - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub + - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub - code.cloudfoundry.org/lager/*.go # gosub - code.cloudfoundry.org/lager/lagerflags/*.go # gosub - code.cloudfoundry.org/locket/*.go # gosub diff --git a/packages/benchmark-bbs/spec b/packages/benchmark-bbs/spec index eebf6e4a2b..c4992fc41c 100644 --- a/packages/benchmark-bbs/spec +++ b/packages/benchmark-bbs/spec @@ -28,6 +28,29 @@ files: - code.cloudfoundry.org/debugserver/*.go # gosub - code.cloudfoundry.org/durationjson/*.go # gosub - code.cloudfoundry.org/executor/*.go # gosub + - code.cloudfoundry.org/go-loggregator/*.go # gosub + - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub + - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub + - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub - code.cloudfoundry.org/lager/*.go # gosub - code.cloudfoundry.org/lager/lagerflags/*.go # gosub - code.cloudfoundry.org/locket/*.go # gosub @@ -59,8 +82,21 @@ files: - github.com/aws/aws-sdk-go/service/s3/s3iface/*.go # gosub - github.com/aws/aws-sdk-go/service/s3/s3manager/*.go # gosub - github.com/bmizerany/pat/*.go # gosub + - github.com/cloudfoundry/dropsonde/*.go # gosub + - github.com/cloudfoundry/dropsonde/emitter/*.go # gosub + - github.com/cloudfoundry/dropsonde/envelope_sender/*.go # gosub + - github.com/cloudfoundry/dropsonde/envelopes/*.go # gosub + - github.com/cloudfoundry/dropsonde/factories/*.go # gosub + - github.com/cloudfoundry/dropsonde/instrumented_handler/*.go # gosub + - github.com/cloudfoundry/dropsonde/instrumented_round_tripper/*.go # gosub + - github.com/cloudfoundry/dropsonde/log_sender/*.go # gosub + - github.com/cloudfoundry/dropsonde/logs/*.go # gosub - github.com/cloudfoundry/dropsonde/metric_sender/*.go # gosub + - github.com/cloudfoundry/dropsonde/metricbatcher/*.go # gosub - github.com/cloudfoundry/dropsonde/metrics/*.go # gosub + - github.com/cloudfoundry/dropsonde/runtime_stats/*.go # gosub + - github.com/cloudfoundry/gosteno/*.go # gosub + - github.com/cloudfoundry/gosteno/syslog/*.go # gosub - github.com/cloudfoundry/sonde-go/events/*.go # gosub - github.com/coreos/go-etcd/etcd/*.go # gosub - github.com/go-sql-driver/mysql/*.go # gosub diff --git a/packages/rep/spec b/packages/rep/spec index 7eddb37736..7708a5e172 100644 --- a/packages/rep/spec +++ b/packages/rep/spec @@ -51,6 +51,9 @@ files: - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub @@ -116,7 +119,6 @@ files: - github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub - github.com/gogo/protobuf/sortkeys/*.go # gosub - github.com/golang/protobuf/proto/*.go # gosub - - github.com/golang/protobuf/ptypes/any/*.go # gosub - github.com/google/shlex/*.go # gosub - github.com/hashicorp/consul/api/*.go # gosub - github.com/hashicorp/consul/vendor/github.com/hashicorp/go-cleanhttp/*.go # gosub diff --git a/packages/rep_windows/spec b/packages/rep_windows/spec index 1e762d900a..1d8418b210 100644 --- a/packages/rep_windows/spec +++ b/packages/rep_windows/spec @@ -52,6 +52,9 @@ files: - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub @@ -117,7 +120,6 @@ files: - github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub - github.com/gogo/protobuf/sortkeys/*.go # gosub - github.com/golang/protobuf/proto/*.go # gosub - - github.com/golang/protobuf/ptypes/any/*.go # gosub - github.com/google/shlex/*.go # gosub - github.com/hashicorp/consul/api/*.go # gosub - github.com/hashicorp/consul/vendor/github.com/hashicorp/go-cleanhttp/*.go # gosub diff --git a/src/code.cloudfoundry.org/bbs b/src/code.cloudfoundry.org/bbs index 3e6bf35e14..928ed12ff4 160000 --- a/src/code.cloudfoundry.org/bbs +++ b/src/code.cloudfoundry.org/bbs @@ -1 +1 @@ -Subproject commit 3e6bf35e1414c8f13507e70014e3532dea300f05 +Subproject commit 928ed12ff41149dc2b780209240dde75be96b8aa diff --git a/src/code.cloudfoundry.org/go-loggregator b/src/code.cloudfoundry.org/go-loggregator index b1525c9ace..1c991136f3 160000 --- a/src/code.cloudfoundry.org/go-loggregator +++ b/src/code.cloudfoundry.org/go-loggregator @@ -1 +1 @@ -Subproject commit b1525c9acecd9ccbfe91592ccb4e2d6fa6eab200 +Subproject commit 1c991136f3e2de106a36e9c78b8c6ece8f46d67e From 4e47261d75b4c245f39e8da71ee48abedf35eee8 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 14 Jul 2017 08:24:59 -0400 Subject: [PATCH 16/37] bump executor Submodule src/code.cloudfoundry.org/executor cacbba59..98339842: > use break instead of a flag which isn't idiomatic and doesn't exit the loop --- src/code.cloudfoundry.org/executor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/executor b/src/code.cloudfoundry.org/executor index cacbba590d..98339842e1 160000 --- a/src/code.cloudfoundry.org/executor +++ b/src/code.cloudfoundry.org/executor @@ -1 +1 @@ -Subproject commit cacbba590df1953bae3b49499b2cc80cc7f051ac +Subproject commit 98339842e105f094cb2cf7d5d06e7998f6fc0e41 From edb126ad9fd9ad5892f7278c066155465297e8bb Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 14 Jul 2017 11:59:32 -0400 Subject: [PATCH 17/37] update the docs in examples/aws with instructions for cf-mysql-deployment [#148322889] --- examples/aws/README.md | 192 +++++++----------- examples/aws/deploy_aws_environment | 22 +- .../infrastructure/cloud-config-internal.yml | 12 +- .../aws/templates/mysql/consul-secrets.yml | 6 + .../mysql/iaas-settings-internal.yml | 117 ----------- .../aws/templates/mysql/iaas-settings.yml | 1 - .../templates/mysql/mysql-overrides-ops.yml | 73 +++++++ 7 files changed, 175 insertions(+), 248 deletions(-) create mode 100644 examples/aws/templates/mysql/consul-secrets.yml delete mode 100644 examples/aws/templates/mysql/iaas-settings-internal.yml delete mode 100644 examples/aws/templates/mysql/iaas-settings.yml create mode 100644 examples/aws/templates/mysql/mysql-overrides-ops.yml diff --git a/examples/aws/README.md b/examples/aws/README.md index cc5ff92e8f..0bf7c8a74f 100644 --- a/examples/aws/README.md +++ b/examples/aws/README.md @@ -839,62 +839,57 @@ To setup a PostgreSQL instance on RDS in AWS, follow the instructions above desc The CF-MySQL release can be deployed in a few different modes and configurations. All configurations have the same starting steps: -1. Make a directory for the CF-MySQL stubs: +1. Edit or create `$DEPLOYMENT_DIR/stubs/aws-instance-types.yml` to optionally have the following: + + ``` yaml + instance_types: + mysql_database: m3.medium # replace with the instance type of the mysql database + mysql_proxy: m3.medium # replace with the instance type of the mysql proxy + mysql_persistent_disk_iops: 1000 # Only set this value if the disk_type is io1 + mysql_persistent_disk_type: gp2 # replace with the disk type of the mysql database + ``` + +1. Clone the [cf-mysql-deployment](https://github.com/cloudfoundry/cf-mysql-deployment) `release-candidate` branch: + + ```bash + git clone -b release-candidate https://github.com/cloudfoundry/cf-mysql-deployment + ``` + +1. Rename the deployment in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + + ```yml + - type: replace + path: /name + value: "DEPLOYMENT_NAME" + ``` + +1. Edit consul ip addresses and encryption key by editing `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + + ```yml + - type: replace + path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/encrypt_keys + value: + REPLACE_WITH_CONSUL_ENCRYPT_KEYS + - type: replace + path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/agent/servers/lan + value: + REPLACE_WITH_CONSUL_SERVER_IPS + ``` + +Consul ip addresses can be found by running `bosh vms | grep consul` + +1. Edit the database passwords in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + ```yml + - type: replace + path: /properties/cf_mysql/mysql/seeded_databases? + value: + - name: diego + username: diego + password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD + - name: locket + username: locket + password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD - ```bash - mkdir -p $DEPLOYMENT_DIR/stubs/cf-mysql - ``` - -1. Clone the CF-MySQL release `release-candidate` branch: - - ```bash - git clone -b release-candidate https://github.com/cloudfoundry/cf-mysql-release.git - export CF_MYSQL_RELEASE_DIR=$PWD/cf-mysql-release - ``` - -1. Copy over relevant stubs from the CF-MySQL release to deployment directory: - - ```bash - cp $CF_MYSQL_RELEASE_DIR/manifest-generation/examples/standalone/property-overrides.yml \ - $CF_MYSQL_RELEASE_DIR/manifest-generation/examples/standalone/instance-count-overrides.yml \ - $DEPLOYMENT_DIR/stubs/cf-mysql/ - ``` - -1. Copy over CF-based manifest stub: - - ```bash - cp $DEPLOYMENT_DIR/deployments/cf.yml $DEPLOYMENT_DIR/stubs/cf-mysql/cf.yml - ``` - -1. Edit `property-overrides.yml`: - 1. Rename the deployment: - - ```yaml - property_overrides: - deployment_name: diego-mysql - ``` - - 1. Fill in all `REPLACE_WITH_` properties with appropriate values. Ignore all `UNUSED_VALUE` properties. - 1. Set the `host` property to `null`. Do not remove it entirely, since the - current manifest-generation scripts for CF-MySQL depend on its presence: - - ```yaml - property_overrides: - host: null - ``` - - 0. Add the following `seeded_databases` property to configure a database for Diego to use. Replace `REPLACE_ME_WITH_DIEGO_DB_PASSWORD` and `REPLACE_ME_WITH_LOCKET_DB_PASSWORD` with the desired password for each database: - - ```yaml - property_overrides: - mysql: - seeded_databases: - - name: diego - username: diego - password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD - - name: locket - username: diego - password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD ``` After that you can deploy the CF-MySQL release in either mode: @@ -905,80 +900,49 @@ After that you can deploy the CF-MySQL release in either mode: * [Highly Available CF-MySQL](#highly-available-cf-mysql) - Recommended for production use. Uses [Consul](https://consul.io) for discovery. -#### Single Node CF-MySQL +#### Migrating from pervious CF-MySQL deployments -1. Edits to `instance-count-overrides.yml`: - - ```yaml - instance_count_overrides: - - name: cf-mysql-broker_z1 - instances: 0 - - name: cf-mysql-broker_z2 - instances: 0 - - name: mysql_z2 - instances: 0 - - name: arbitrator_z3 - instances: 0 - - name: proxy_z1 - instances: 0 - - name: proxy_z2 - instances: 0 - ``` +If you have used the old style [manifest generation](https://github.com/cloudfoundry/cf-mysql-release/tree/v35.1.0/manifest-generation), then you will have to follow the steps in [cf-mysql-deployment](https://github.com/cloudfoundry/cf-mysql-deployment#upgrading-from-previous-deployment-topologies) to update to the new `cf-mysql-deployment` style. -1. Generate deployment manifest: - - ```bash - $CF_MYSQL_RELEASE_DIR/scripts/generate-deployment-manifest \ - -c $DEPLOYMENT_DIR/stubs/cf-mysql/cf.yml \ - -p $DEPLOYMENT_DIR/stubs/cf-mysql/property-overrides.yml \ - -i $DEPLOYMENT_DIR/stubs/cf-mysql/iaas-settings.yml \ - -n $DEPLOYMENT_DIR/stubs/cf-mysql/instance-count-overrides.yml \ - > $DEPLOYMENT_DIR/deployments/cf-mysql.yml - ``` +#### Single Node CF-MySQL -1. Deploy the CF-MySQL cluster +1. Add the following to `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: - ```bash - cd $CF_MYSQL_RELEASE_DIR - bosh create release && bosh upload release && bosh -d $DEPLOYMENT_DIR/deployments/cf-mysql.yml deploy + ```yml +- type: replace + path: /instance_groups/name=proxy/instances? + value: 0 +- type: replace + path: /instance_groups/name=arbitrator/instances? + value: 0 +- type: replace + path: /instance_groups/name=mysql/instances? + value: 1 ``` #### Highly Available CF-MySQL -1. Copy additional `job-overrides-consul.yml`: +No changes are required since the default manifest deploys highly available CF-MySQL - ```bash - cp $CF_MYSQL_RELEASE_DIR/manifest-generation/examples/job-overrides-consul.yml \ - $DEPLOYMENT_DIR/stubs/cf-mysql/ - ``` +#### Deploying CF-MySQL -1. Edits to `property-overrides.yml`, add the following properties: - - ```yaml - property_overrides: - proxy: - # ... - consul_enabled: true - consul_service_name: mysql - ``` - -1. Generate deployment manifest: +1. Update the cloud config (generated by `deploy_aws_environment`): ```bash - $CF_MYSQL_RELEASE_DIR/scripts/generate-deployment-manifest \ - -c $DEPLOYMENT_DIR/stubs/cf-mysql/cf.yml \ - -p $DEPLOYMENT_DIR/stubs/cf-mysql/property-overrides.yml \ - -i $DEPLOYMENT_DIR/stubs/cf-mysql/iaas-settings.yml \ - -j $DEPLOYMENT_DIR/stubs/cf-mysql/job-overrides-consul.yml \ - -n $DEPLOYMENT_DIR/stubs/cf-mysql/instance-count-overrides.yml \ - > $DEPLOYMENT_DIR/deployments/cf-mysql.yml + bosh update-cloud-config $DEPLOYMENT_DIR/stubs/cloud-config.yml ``` -1. Deploy the CF-MySQL cluster +1. Deploy: - ```bash - bosh -d $DEPLOYMENT_DIR/deployments/cf-mysql.yml deploy - ``` + ```bash + bosh -d deploy cf-mysql-deployment/cf-mysql-deployment.yml \ + --vars-file $DEPLOYMENT_DIR/stubs/cf-mysql/consul-secrets.yml \ + --vars-store $DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml \ + -o cf-mysql-deployment/operations/proxy-consul.yml \ + -o $DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml --no-redact + ``` + +**NOTE** this command will store some credentials in `$DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml` make sure you commit this file. ### Use the PostgreSQL job from CF-Release diff --git a/examples/aws/deploy_aws_environment b/examples/aws/deploy_aws_environment index d853270d4a..1da6ed3b67 100755 --- a/examples/aws/deploy_aws_environment +++ b/examples/aws/deploy_aws_environment @@ -403,22 +403,22 @@ spiff merge \ stubs/aws-resources.yml \ > stubs/routing/iaas-settings.yml -mkdir -p stubs/cf-mysql - -# generate CF-MySQL IaaS-settings stub -spiff merge \ - $SCRIPT_DIR/templates/mysql/iaas-settings.yml \ - $SCRIPT_DIR/templates/mysql/iaas-settings-internal.yml \ - stubs/aws-resources.yml \ - > stubs/cf-mysql/iaas-settings.yml - -# generate cloud config stub +# generate mysql cloud config stub spiff merge \ $SCRIPT_DIR/templates/infrastructure/cloud-config.yml \ $SCRIPT_DIR/templates/infrastructure/cloud-config-internal.yml \ - stubs/aws-resources.yml \ + $aws_instance_types stubs/aws-resources.yml \ > stubs/cloud-config.yml +mkdir -p stubs/cf-mysql + +if [ ! -f stubs/cf-mysql/mysql-overrides-ops.yml ]; then + cp $SCRIPT_DIR/templates/mysql/mysql-overrides-ops.yml stubs/cf-mysql/mysql-overrides-ops.yml +fi + +spiff merge $SCRIPT_DIR/templates/mysql/consul-secrets.yml <(cf_credentials) > stubs/cf-mysql/consul-secrets.yml + + # generate datadog firehose nozzle manifest if the user stubs exist if [ -d stubs/datadog-firehose-nozzle ]; then spiff merge \ diff --git a/examples/aws/templates/infrastructure/cloud-config-internal.yml b/examples/aws/templates/infrastructure/cloud-config-internal.yml index 27277ef3bd..70448843b1 100644 --- a/examples/aws/templates/infrastructure/cloud-config-internal.yml +++ b/examples/aws/templates/infrastructure/cloud-config-internal.yml @@ -1,3 +1,5 @@ +instance_types: (( merge )) + azs: - name: z1 cloud_properties: @@ -13,16 +15,16 @@ azs: vm_types: - name: database cloud_properties: - instance_type: c3.4xlarge + instance_type: (( instance_types.mysql_database || "m3.medium" )) - name: proxy cloud_properties: - instance_type: c3.2xlarge + instance_type: (( instance_types.mysql_proxy || "m3.medium" )) - name: arbitrator cloud_properties: instance_type: t2.micro - name: errand cloud_properties: - instance_type: m3.large + instance_type: m3.medium - name: compilation cloud_properties: instance_type: c4.large @@ -31,8 +33,8 @@ vm_types: type: gp2 disk_types: - cloud_properties: - iops: 2000 - type: io1 + iops: (( instance_types.mysql_persistent_disk_iops || nil )) + type: (( instance_types.mysql_persistent_disk_type || "gp2" )) disk_size: 100000 name: mysql-persistent-disk diff --git a/examples/aws/templates/mysql/consul-secrets.yml b/examples/aws/templates/mysql/consul-secrets.yml new file mode 100644 index 0000000000..f934512e4f --- /dev/null +++ b/examples/aws/templates/mysql/consul-secrets.yml @@ -0,0 +1,6 @@ +cf_credentials: ((merge)) +consul_agent_cert: ((cf_credentials.consul.agent_cert)) +consul_agent_key: ((cf_credentials.consul.agent_key)) +consul_server_cert: ((cf_credentials.consul.server_cert)) +consul_server_key: ((cf_credentials.consul.server_key)) +consul_ca_cert: ((cf_credentials.consul.ca_cert)) diff --git a/examples/aws/templates/mysql/iaas-settings-internal.yml b/examples/aws/templates/mysql/iaas-settings-internal.yml deleted file mode 100644 index f297440e5a..0000000000 --- a/examples/aws/templates/mysql/iaas-settings-internal.yml +++ /dev/null @@ -1,117 +0,0 @@ -iaas_settings: - stemcell: - name: bosh-aws-xen-hvm-ubuntu-trusty-go_agent - version: latest - subnet_configs: - - name: mysql1 - subnets: - - range: (( Resources.SubnetCIDR.MySQLZ1 )) - reserved: - - (( Resources.SubnetOctets.MySQLZ1.[2] ".2 - " Resources.SubnetOctets.MySQLZ1.[2] ".9" )) - - (( Resources.SubnetOctets.MySQLZ1.[2] ".130 - " Resources.SubnetOctets.MySQLZ1.[2] ".254" )) - static: (( [Resources.SubnetOctets.MySQLZ1.[2] ".10 - " Resources.SubnetOctets.MySQLZ1.[2] ".63"] )) - gateway: (( Resources.SubnetOctets.MySQLZ1.[2] ".1" )) - dns: (( [Resources.SubnetOctets.MySQLZ1.[1] ".0.2"] )) - cloud_properties: - subnet: (( Resources.Subnet.MySQLZ1 )) - - name: mysql2 - subnets: - - range: (( Resources.SubnetCIDR.MySQLZ2 )) - reserved: - - (( Resources.SubnetOctets.MySQLZ2.[2] ".2 - " Resources.SubnetOctets.MySQLZ2.[2] ".9" )) - - (( Resources.SubnetOctets.MySQLZ2.[2] ".130 - " Resources.SubnetOctets.MySQLZ2.[2] ".254" )) - static: (( [Resources.SubnetOctets.MySQLZ2.[2] ".10 - " Resources.SubnetOctets.MySQLZ2.[2] ".63"] )) - gateway: (( Resources.SubnetOctets.MySQLZ2.[2] ".1" )) - dns: (( [Resources.SubnetOctets.MySQLZ2.[1] ".0.2"] )) - cloud_properties: - subnet: (( Resources.Subnet.MySQLZ2 )) - - name: mysql3 - subnets: - - range: (( Resources.SubnetCIDR.MySQLZ3 )) - reserved: - - (( Resources.SubnetOctets.MySQLZ3.[2] ".2 - " Resources.SubnetOctets.MySQLZ3.[2] ".9" )) - - (( Resources.SubnetOctets.MySQLZ3.[2] ".130 - " Resources.SubnetOctets.MySQLZ3.[2] ".254" )) - static: (( [Resources.SubnetOctets.MySQLZ3.[2] ".10 - " Resources.SubnetOctets.MySQLZ3.[2] ".63"] )) - gateway: (( Resources.SubnetOctets.MySQLZ3.[2] ".1" )) - dns: (( [Resources.SubnetOctets.MySQLZ3.[1] ".0.2"] )) - cloud_properties: - subnet: (( Resources.Subnet.MySQLZ3 )) - compilation_cloud_properties: - instance_type: c4.large - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) - ephemeral_disk: - size: 30000 # in MB - type: gp2 - resource_pool_cloud_properties: - - name: mysql_z1 - cloud_properties: - instance_type: m3.large - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) - - - name: mysql_z2 - cloud_properties: - instance_type: m3.large - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) - - - name: mysql_z3 - cloud_properties: - instance_type: m3.large - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ3 )) - - - name: arbitrator_z3 - cloud_properties: - instance_type: t2.small - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ3 )) - - - name: proxy_z1 - cloud_properties: - instance_type: m3.medium - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) - - - name: proxy_z2 - cloud_properties: - instance_type: m3.medium - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) - - - name: cf-mysql-broker_z1 - cloud_properties: - instance_type: m3.medium - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) - - - name: cf-mysql-broker_z2 - cloud_properties: - instance_type: m3.medium - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) - - - name: errands_z1 - cloud_properties: - instance_type: m3.medium - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) - - disk_pools: - - name: mysql-persistent-disk - disk_size: 100000 - cloud_properties: - type: gp2 - -Resources: - Subnet: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SubnetAvailabilityZone: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SubnetOctets: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SubnetCIDR: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SecurityGroupName: - Internal: (( merge )) - LoadBalancer: - SSHProxyELB: (( merge )) diff --git a/examples/aws/templates/mysql/iaas-settings.yml b/examples/aws/templates/mysql/iaas-settings.yml deleted file mode 100644 index 850f208d7f..0000000000 --- a/examples/aws/templates/mysql/iaas-settings.yml +++ /dev/null @@ -1 +0,0 @@ -iaas_settings: (( merge )) diff --git a/examples/aws/templates/mysql/mysql-overrides-ops.yml b/examples/aws/templates/mysql/mysql-overrides-ops.yml new file mode 100644 index 0000000000..035bd53444 --- /dev/null +++ b/examples/aws/templates/mysql/mysql-overrides-ops.yml @@ -0,0 +1,73 @@ +- type: replace + path: /name + value: "REPLACE_WITH_DEPLOYMENT_NAME" +- type: replace + path: /properties/cf_mysql/mysql/innodb_flush_log_at_trx_commit? + value: 0 +- type: replace + path: /properties/cf_mysql/mysql/binlog_enabled? + value: false +- type: replace + path: /properties/cf_mysql/mysql/binlog_expire_days? + value: 5 +- type: replace + path: /properties/cf_mysql/mysql/innodb_buffer_pool_size? + value: 12_000_000_000 # set the innodb buffer pool size to 12GB ~80% of memory +- type: replace + path: /properties/cf_mysql/mysql/innodb_buffer_pool_instances? + value: 16 +- type: replace + path: /instance_groups/name=mysql/vm_type? + value: database +- type: replace + path: /instance_groups/name=mysql/persistent_disk_type? + value: mysql-persistent-disk +- type: remove + path: /instance_groups/name=mysql/persistent_disk? +- type: replace + path: /instance_groups/name=proxy/vm_type? + value: proxy +- type: replace + path: /instance_groups/name=arbitrator/vm_type? + value: arbitrator +- type: replace + path: /instance_groups/name=rejoin-unsafe/vm_type? + value: errand +- type: replace + path: /instance_groups/name=rejoin-unsafe/instances? + value: 0 +- type: replace + path: /instance_groups/name=verify-cluster-schemas/vm_type? + value: errand +- type: replace + path: /instance_groups/name=verify-cluster-schemas/instances? + value: 0 +- type: replace + path: /instance_groups/name=smoke-tests/vm_type? + value: errand +- type: replace + path: /instance_groups/name=smoke-tests/instances? + value: 0 +- type: replace + path: /instance_groups/name=bootstrap/vm_type? + value: errand +- type: replace + path: /stemcells/alias=default/version + value: latest +- type: replace + path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/encrypt_keys + value: + REPLACE_WITH_CONSUL_ENCRYPT_KEYS +- type: replace + path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/agent/servers/lan + value: + REPLACE_WITH_CONSUL_SERVER_IPS +- type: replace + path: /properties/cf_mysql/mysql/seeded_databases? + value: + - name: diego + username: diego + password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD + - name: locket + username: locket + password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD From 7c4eedec707d036da3574269aeff26a4fbf220f0 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 14 Jul 2017 12:57:55 -0400 Subject: [PATCH 18/37] bump benchmarkbbs Submodule src/code.cloudfoundry.org/benchmarkbbs 3ae15bcc..6d2ad464: > Fix compilation error in the benchmark test suite --- packages/benchmark-bbs/spec | 1 + src/code.cloudfoundry.org/benchmarkbbs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/benchmark-bbs/spec b/packages/benchmark-bbs/spec index c4992fc41c..cce7872649 100644 --- a/packages/benchmark-bbs/spec +++ b/packages/benchmark-bbs/spec @@ -32,6 +32,7 @@ files: - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub + - code.cloudfoundry.org/go-loggregator/testhelpers/fakes/v1/*.go # gosub - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub diff --git a/src/code.cloudfoundry.org/benchmarkbbs b/src/code.cloudfoundry.org/benchmarkbbs index 3ae15bcc3f..6d2ad464da 160000 --- a/src/code.cloudfoundry.org/benchmarkbbs +++ b/src/code.cloudfoundry.org/benchmarkbbs @@ -1 +1 @@ -Subproject commit 3ae15bcc3f962ae71bfcf5ec3673a792379368a6 +Subproject commit 6d2ad464daa1f7d9c43f2449f932f110578b59ca From bc933f2cc248cc41f91be87b0b4451d29c25ea76 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 14 Jul 2017 13:30:18 -0400 Subject: [PATCH 19/37] bump buildpackapplifecycle Submodule src/code.cloudfoundry.org/buildpackapplifecycle 4bad9b68..bbd4bb3a: > pass the error to newDescriptiveError in order to get a descriptive error --- src/code.cloudfoundry.org/buildpackapplifecycle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/buildpackapplifecycle b/src/code.cloudfoundry.org/buildpackapplifecycle index 4bad9b686c..bbd4bb3ad0 160000 --- a/src/code.cloudfoundry.org/buildpackapplifecycle +++ b/src/code.cloudfoundry.org/buildpackapplifecycle @@ -1 +1 @@ -Subproject commit 4bad9b686c3d00ece7872bde278997321d1aef7d +Subproject commit bbd4bb3ad0cef4b3c9392e202ffbdc6e9ee016ce From d2fa2bf7bff295950e593a94bcaffdcfa48c5a09 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 14 Jul 2017 15:45:55 -0400 Subject: [PATCH 20/37] bump route-emitter [finishes #148419281] Submodule src/code.cloudfoundry.org/route-emitter f95c6093..dc584c5a: > Rename HTTPEndpointCount -> HTTPAssociationsCount & TCPRouteCount -> TCPAssociationsCount > Fix TCP and HTTP route counts --- src/code.cloudfoundry.org/route-emitter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/route-emitter b/src/code.cloudfoundry.org/route-emitter index f95c6093df..dc584c5a0b 160000 --- a/src/code.cloudfoundry.org/route-emitter +++ b/src/code.cloudfoundry.org/route-emitter @@ -1 +1 @@ -Subproject commit f95c6093df6494bbbfebe2440538583fef2244da +Subproject commit dc584c5a0b41da0bd7289f8aa46966604e2599a1 From 4de2d6212165157799750f5e1b739575dfccedf6 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 14 Jul 2017 16:27:35 -0400 Subject: [PATCH 21/37] bump locket [finishes #147904015] Submodule src/code.cloudfoundry.org/locket 79f2e81f..ea68c623: > log all errors from db.Lock unless it is a collision --- src/code.cloudfoundry.org/locket | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/locket b/src/code.cloudfoundry.org/locket index 79f2e81fed..ea68c62374 160000 --- a/src/code.cloudfoundry.org/locket +++ b/src/code.cloudfoundry.org/locket @@ -1 +1 @@ -Subproject commit 79f2e81fed4e4745ba00d2014fae1f63762951a3 +Subproject commit ea68c623742367078c2a660543cde875faea2532 From c924d3e46484ae5b025178f5aa87ccb19959f0a3 Mon Sep 17 00:00:00 2001 From: Brandon Shroyer Date: Fri, 14 Jul 2017 14:55:51 -0700 Subject: [PATCH 22/37] bump bbs [finishes #147972249] Submodule src/code.cloudfoundry.org/bbs 928ed12f..0618842c: > fixed broken links and minor updates to docs Signed-off-by: Anoop Gopalakrishnan --- src/code.cloudfoundry.org/bbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/bbs b/src/code.cloudfoundry.org/bbs index 928ed12ff4..0618842c69 160000 --- a/src/code.cloudfoundry.org/bbs +++ b/src/code.cloudfoundry.org/bbs @@ -1 +1 @@ -Subproject commit 928ed12ff41149dc2b780209240dde75be96b8aa +Subproject commit 0618842c6996db7be7cbe25e9966ed342e648638 From e954fe02f67a6b3897b5d856ae426b3897247a51 Mon Sep 17 00:00:00 2001 From: Anoop Gopalakrishnan Date: Fri, 14 Jul 2017 14:57:50 -0700 Subject: [PATCH 23/37] bump executor [finishes #148628383] Submodule src/code.cloudfoundry.org/executor 98339842..fe7ee145: > [#148628383] Skips showing trailing `cancelled` in the error message from health check Signed-off-by: Brandon Shroyer --- src/code.cloudfoundry.org/executor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/executor b/src/code.cloudfoundry.org/executor index 98339842e1..fe7ee14598 160000 --- a/src/code.cloudfoundry.org/executor +++ b/src/code.cloudfoundry.org/executor @@ -1 +1 @@ -Subproject commit 98339842e105f094cb2cf7d5d06e7998f6fc0e41 +Subproject commit fe7ee14598b25d6a75f21f8c8d394e2607a69b1f From 6b8f18c45bd65725e7cb3489eccaf2f008b57927 Mon Sep 17 00:00:00 2001 From: Swetha Repakula Date: Fri, 14 Jul 2017 15:40:24 -0700 Subject: [PATCH 24/37] bump auctioneer bbs [finishes #141115913] Submodule src/code.cloudfoundry.org/auctioneer 82492a5..87b4d67: > convert auctioneer to optionally use loggregator v2 API Submodule src/code.cloudfoundry.org/bbs 0618842..a1e0bec: > fix flakey test > refactor middleware package Signed-off-by: Chris Piraino --- jobs/auctioneer/spec | 16 ++++++++ jobs/auctioneer/templates/auctioneer.json.erb | 40 +++++++++++++------ .../templates/loggregator_ca.crt.erb | 4 ++ .../templates/loggregator_client.crt.erb | 3 ++ .../templates/loggregator_client.key.erb | 4 ++ packages/auctioneer/spec | 24 +++++++++++ src/code.cloudfoundry.org/auctioneer | 2 +- src/code.cloudfoundry.org/bbs | 2 +- 8 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 jobs/auctioneer/templates/loggregator_ca.crt.erb create mode 100644 jobs/auctioneer/templates/loggregator_client.crt.erb create mode 100644 jobs/auctioneer/templates/loggregator_client.key.erb diff --git a/jobs/auctioneer/spec b/jobs/auctioneer/spec index 001cf950b5..acac9ffbec 100644 --- a/jobs/auctioneer/spec +++ b/jobs/auctioneer/spec @@ -15,6 +15,9 @@ templates: rep_ca.crt.erb: config/certs/rep/ca.crt rep_client.crt.erb: config/certs/rep/client.crt rep_client.key.erb: config/certs/rep/client.key + loggregator_ca.crt.erb: config/certs/loggregator/ca.crt + loggregator_client.crt.erb: config/certs/loggregator/client.crt + loggregator_client.key.erb: config/certs/loggregator/client.key packages: - pid_utils @@ -85,3 +88,16 @@ properties: diego.auctioneer.skip_consul_lock: default: false description: "EXPERIMENTAL: true to skip consul lock. locket.api_location must be set" + + loggregator.use_v2_api: + description: "True to use local metron agent gRPC v2 api. False, to use UDP v1 api" + default: false + loggregator.v2_api_port: + description: "Local metron agent gRPC port" + default: 3458 + loggregator.ca_cert: + description: "CA Cert used to communicate with local metron agent over gRPC" + loggregator.cert: + description: "Cert used to communicate with local metron agent over gRPC" + loggregator.key: + description: "Key used to communicate with local metron agent over gRPC" diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index f9ba1af775..12e7ce6941 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -1,5 +1,5 @@ <%= - CONF_DIR = "/var/vcap/jobs/auctioneer/config" + conf_dir = "/var/vcap/jobs/auctioneer/config" config = { dropsonde_port: p("diego.auctioneer.dropsonde_port"), @@ -15,9 +15,9 @@ } if p("diego.auctioneer.bbs.require_ssl") - config[:bbs_ca_cert_file] = "#{CONF_DIR}/certs/bbs/ca.crt" - config[:bbs_client_cert_file] = "#{CONF_DIR}/certs/bbs/client.crt" - config[:bbs_client_key_file] = "#{CONF_DIR}/certs/bbs/client.key" + config[:bbs_ca_cert_file] = "#{conf_dir}/certs/bbs/ca.crt" + config[:bbs_client_cert_file] = "#{conf_dir}/certs/bbs/client.crt" + config[:bbs_client_key_file] = "#{conf_dir}/certs/bbs/client.key" config[:bbs_address] = "https://#{p("diego.auctioneer.bbs.api_location")}" else config[:bbs_address] = "http://#{p("diego.auctioneer.bbs.api_location")}" @@ -32,28 +32,42 @@ end if_p("diego.auctioneer.rep.ca_cert", "diego.auctioneer.rep.client_key", "diego.auctioneer.rep.client_cert") do - config[:rep_client_cert] = "#{CONF_DIR}/certs/rep/client.crt" - config[:rep_client_key] = "#{CONF_DIR}/certs/rep/client.key" - config[:rep_ca_cert] = "#{CONF_DIR}/certs/rep/ca.crt" + config[:rep_client_cert] = "#{conf_dir}/certs/rep/client.crt" + config[:rep_client_key] = "#{conf_dir}/certs/rep/client.key" + config[:rep_ca_cert] = "#{conf_dir}/certs/rep/ca.crt" end if p("diego.auctioneer.ca_cert", "") != "" || p("diego.auctioneer.server_cert", "") != "" || p("diego.auctioneer.server_key", "") != "" - config[:ca_cert_file] = "#{CONF_DIR}/certs/auctioneer/ca.crt" - config[:server_cert_file] = "#{CONF_DIR}/certs/auctioneer/server.crt" - config[:server_key_file] = "#{CONF_DIR}/certs/auctioneer/server.key" + config[:ca_cert_file] = "#{conf_dir}/certs/auctioneer/ca.crt" + config[:server_cert_file] = "#{conf_dir}/certs/auctioneer/server.crt" + config[:server_key_file] = "#{conf_dir}/certs/auctioneer/server.key" end if_p("diego.auctioneer.locket.api_location") do |value| config[:locket_address] = value config[:uuid] = spec.id - config[:locket_ca_cert_file] = "#{CONF_DIR}/certs/bbs/ca.crt" - config[:locket_client_cert_file] = "#{CONF_DIR}/certs/bbs/client.crt" - config[:locket_client_key_file] = "#{CONF_DIR}/certs/bbs/client.key" + config[:locket_ca_cert_file] = "#{conf_dir}/certs/bbs/ca.crt" + config[:locket_client_cert_file] = "#{conf_dir}/certs/bbs/client.crt" + 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 + config[:loggregator]={} + config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api") + if p("loggregator.use_v2_api") == true + config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port") + config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt" + config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt" + config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key" + config[:loggregator][:loggregator_job_deployment] = spec.deployment + config[:loggregator][:loggregator_job_name] = spec.name + config[:loggregator][:loggregator_job_index] = spec.id + config[:loggregator][:loggregator_job_ip] = spec.address + config[:loggregator][:loggregator_job_origin] = "auctioneer" + end + config.to_json %> diff --git a/jobs/auctioneer/templates/loggregator_ca.crt.erb b/jobs/auctioneer/templates/loggregator_ca.crt.erb new file mode 100644 index 0000000000..150228f869 --- /dev/null +++ b/jobs/auctioneer/templates/loggregator_ca.crt.erb @@ -0,0 +1,4 @@ +<% if_p("loggregator.ca_cert") do |value| %> +<%= value %> +<% end %> + diff --git a/jobs/auctioneer/templates/loggregator_client.crt.erb b/jobs/auctioneer/templates/loggregator_client.crt.erb new file mode 100644 index 0000000000..725c7bc0de --- /dev/null +++ b/jobs/auctioneer/templates/loggregator_client.crt.erb @@ -0,0 +1,3 @@ +<% if_p("loggregator.cert") do |value| %> +<%= value %> +<% end %> diff --git a/jobs/auctioneer/templates/loggregator_client.key.erb b/jobs/auctioneer/templates/loggregator_client.key.erb new file mode 100644 index 0000000000..c71c6d51f2 --- /dev/null +++ b/jobs/auctioneer/templates/loggregator_client.key.erb @@ -0,0 +1,4 @@ +<% if_p("loggregator.key") do |value| %> +<%= value %> +<% end %> + diff --git a/packages/auctioneer/spec b/packages/auctioneer/spec index 4830d783a4..ad0b5ace34 100644 --- a/packages/auctioneer/spec +++ b/packages/auctioneer/spec @@ -26,6 +26,30 @@ files: - code.cloudfoundry.org/debugserver/*.go # gosub - code.cloudfoundry.org/durationjson/*.go # gosub - code.cloudfoundry.org/executor/*.go # gosub + - code.cloudfoundry.org/go-loggregator/*.go # gosub + - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub + - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub + - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub + - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub + - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub - code.cloudfoundry.org/lager/*.go # gosub - code.cloudfoundry.org/lager/lagerflags/*.go # gosub - code.cloudfoundry.org/localip/*.go # gosub diff --git a/src/code.cloudfoundry.org/auctioneer b/src/code.cloudfoundry.org/auctioneer index 82492a50b3..87b4d67f93 160000 --- a/src/code.cloudfoundry.org/auctioneer +++ b/src/code.cloudfoundry.org/auctioneer @@ -1 +1 @@ -Subproject commit 82492a50b3f3fae9a8408f3dc5f66578dfccd8d4 +Subproject commit 87b4d67f9315dd705748aca63b0076f1cdec2c45 diff --git a/src/code.cloudfoundry.org/bbs b/src/code.cloudfoundry.org/bbs index 0618842c69..a1e0becf09 160000 --- a/src/code.cloudfoundry.org/bbs +++ b/src/code.cloudfoundry.org/bbs @@ -1 +1 @@ -Subproject commit 0618842c6996db7be7cbe25e9966ed342e648638 +Subproject commit a1e0becf0948b7e62912e09ce411442ad6d347db From 5d08f1aef3c4f7227ede1e009e9d60ff739d69af Mon Sep 17 00:00:00 2001 From: "CI (Automated)" Date: Sat, 15 Jul 2017 00:35:12 +0000 Subject: [PATCH 25/37] Create final release 1.23.0 --- .final_builds/jobs/auctioneer/index.yml | 4 + .final_builds/jobs/bbs/index.yml | 4 + .final_builds/packages/auctioneer/index.yml | 4 + .final_builds/packages/bbs/index.yml | 4 + .../packages/benchmark-bbs/index.yml | 4 + .../buildpack_app_lifecycle/index.yml | 4 + .final_builds/packages/cfdot/index.yml | 4 + .final_builds/packages/diego-sshd/index.yml | 4 + .../packages/docker_app_lifecycle/index.yml | 4 + .final_builds/packages/locket/index.yml | 4 + .final_builds/packages/rep/index.yml | 4 + .final_builds/packages/rep_windows/index.yml | 4 + releases/diego-1.23.0.yml | 187 ++++++++++++++++++ releases/index.yml | 2 + 14 files changed, 237 insertions(+) create mode 100644 releases/diego-1.23.0.yml diff --git a/.final_builds/jobs/auctioneer/index.yml b/.final_builds/jobs/auctioneer/index.yml index ed27f52b53..b0905b1c77 100644 --- a/.final_builds/jobs/auctioneer/index.yml +++ b/.final_builds/jobs/auctioneer/index.yml @@ -188,4 +188,8 @@ builds: version: bd357fda056ec0f2edf29f0c9183dde36af99a93 sha1: affecabafe4f1273c34a6d9a6d70353a08158969 blobstore_id: fd685f15-4cf9-4b6f-8fa4-25e26a1efe13 + 098f17c636e82c8f1bffcf7524ccbec85ba0026c: + version: 098f17c636e82c8f1bffcf7524ccbec85ba0026c + sha1: 03f69d701eaa269a9f583754e0bd2b2a5ca822fa + blobstore_id: 11744c33-cbd0-427a-bd80-7af6de1ec58a format-version: '2' diff --git a/.final_builds/jobs/bbs/index.yml b/.final_builds/jobs/bbs/index.yml index 7b9a441cbc..f4a5759e14 100644 --- a/.final_builds/jobs/bbs/index.yml +++ b/.final_builds/jobs/bbs/index.yml @@ -160,4 +160,8 @@ builds: version: cafe0e5eff944f26b960006a835356304e02f9e2 sha1: bfdfdc67aa0266ba90ba95c4e3462d3d0b85cea0 blobstore_id: e7fad5bb-2197-4564-bf91-88a39fec1048 + 85652b024b54f0e9f248bb61766ea321814a17ba: + version: 85652b024b54f0e9f248bb61766ea321814a17ba + sha1: 767771de54da120681c6ab7c62edbb5fb0c154e6 + blobstore_id: f5431177-0526-46f3-84c4-da932f264cb2 format-version: '2' diff --git a/.final_builds/packages/auctioneer/index.yml b/.final_builds/packages/auctioneer/index.yml index ef03444d28..32eb401824 100644 --- a/.final_builds/packages/auctioneer/index.yml +++ b/.final_builds/packages/auctioneer/index.yml @@ -1284,4 +1284,8 @@ builds: version: 20545141cea1e9edbcf2886587a373df85ac896f sha1: 957ab48788b0ef3c5237d3b76b95e84b4104d512 blobstore_id: 5b9fcb2e-a42e-4a19-92de-e87dc7f6db3e + 28a97f9b8a6769a0780df168be35d2c6153799b9: + version: 28a97f9b8a6769a0780df168be35d2c6153799b9 + sha1: 507c496605f8a69499d1bffbd7b272a434c2813a + blobstore_id: 296f4663-5bb8-4dc9-b813-77a0576e1592 format-version: '2' diff --git a/.final_builds/packages/bbs/index.yml b/.final_builds/packages/bbs/index.yml index d0399f46bc..c8ee5d9311 100644 --- a/.final_builds/packages/bbs/index.yml +++ b/.final_builds/packages/bbs/index.yml @@ -488,4 +488,8 @@ builds: version: ec864334278588163141f484a045c88802e04724 sha1: cf71eafe7a5d0c4a4fdb390488c135487a0d35c1 blobstore_id: d3ad2956-84b8-41eb-acb8-1d387f6e42b1 + 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa: + version: 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa + sha1: 5b5fd0e5f297f323710d6274a178edc12a82a8fe + blobstore_id: 2ead2fb4-a1c0-4428-adc6-642a6f982ab2 format-version: '2' diff --git a/.final_builds/packages/benchmark-bbs/index.yml b/.final_builds/packages/benchmark-bbs/index.yml index 966c9e2d50..c2b8b94552 100644 --- a/.final_builds/packages/benchmark-bbs/index.yml +++ b/.final_builds/packages/benchmark-bbs/index.yml @@ -336,4 +336,8 @@ builds: version: cc173e1d081296ba1aa2c2e63f8788032868d48d sha1: 34feb0092672d7bc4b233eaa99cf4dce06b7bd12 blobstore_id: 1171d64c-e035-4262-8ba0-16c709215883 + 06fbc6c7741f2f9018f184a8fabf378967a0064b: + version: 06fbc6c7741f2f9018f184a8fabf378967a0064b + sha1: e0d21eca295ab439a741cfde3d5f4ad480b354dc + blobstore_id: 4e2a79db-e641-4792-8b7a-73009b256710 format-version: '2' diff --git a/.final_builds/packages/buildpack_app_lifecycle/index.yml b/.final_builds/packages/buildpack_app_lifecycle/index.yml index 5d42e1aa15..c542187915 100644 --- a/.final_builds/packages/buildpack_app_lifecycle/index.yml +++ b/.final_builds/packages/buildpack_app_lifecycle/index.yml @@ -188,4 +188,8 @@ builds: version: 5689eeb118926f586e15bffd8b58bb1b3c0f223c sha1: 3d847899504df650ca4df6b6202a336b7c4a04ea blobstore_id: 9b2aa0d2-3d06-4ed3-8772-da26dd7e8847 + ea41f1666258427696c033b8b8b23b789ded3115: + version: ea41f1666258427696c033b8b8b23b789ded3115 + sha1: 9e56b0d90d98c59a076d5ad8a7158512762991f1 + blobstore_id: 1da2f0e9-f96d-469b-b19c-2d92a296890a format-version: '2' diff --git a/.final_builds/packages/cfdot/index.yml b/.final_builds/packages/cfdot/index.yml index ed2dbed2fa..6bac07952e 100644 --- a/.final_builds/packages/cfdot/index.yml +++ b/.final_builds/packages/cfdot/index.yml @@ -136,4 +136,8 @@ builds: version: dcfa79035c570c22eb57c27f79bf711688345e3a sha1: 5a61cc1d943c8493108db04f259807532e2cd021 blobstore_id: 132a79ec-44f3-4c00-861a-7868a57aa8b5 + 6354c1d785f2aef443958877ebe9f5264567dba1: + version: 6354c1d785f2aef443958877ebe9f5264567dba1 + sha1: 576dfb9e6c56e76fa5701b0eebb6e6b5a0883c66 + blobstore_id: 3629278d-160f-4c35-89cb-1c6f05bfd89f format-version: '2' diff --git a/.final_builds/packages/diego-sshd/index.yml b/.final_builds/packages/diego-sshd/index.yml index 84def6539f..bd3c3b236c 100644 --- a/.final_builds/packages/diego-sshd/index.yml +++ b/.final_builds/packages/diego-sshd/index.yml @@ -564,4 +564,8 @@ builds: version: e926fd1bd1da3bab5c78e530cfe68932c5831674 sha1: b60e89c00a548834e9b8e9104541c191e8fc11c9 blobstore_id: 70a4ee76-d544-4f1d-8b7f-b166d948083c + d2ebf26754a19b68eebb49d5b967efc33be2e45d: + version: d2ebf26754a19b68eebb49d5b967efc33be2e45d + sha1: 9d81e3900361df2a29631422ce3656f8b5b94276 + blobstore_id: 3494ab02-63b7-4b0f-baf6-fa3ba45ac389 format-version: '2' diff --git a/.final_builds/packages/docker_app_lifecycle/index.yml b/.final_builds/packages/docker_app_lifecycle/index.yml index 1d3e1ad847..ed9b523d0d 100644 --- a/.final_builds/packages/docker_app_lifecycle/index.yml +++ b/.final_builds/packages/docker_app_lifecycle/index.yml @@ -152,4 +152,8 @@ builds: version: f87324f504027becdb6f931da090264713ad0086 sha1: 25bbc31eec8699c81e97dea749fd5b0ae29b68be blobstore_id: 885dabcc-8197-427a-ac85-8e2f9529b956 + bbe7d156987f3ff9108b2732b457fd4b037043fd: + version: bbe7d156987f3ff9108b2732b457fd4b037043fd + sha1: 494f029ea2fe4b11f92fc16d8030e8fd426c2c13 + blobstore_id: 3c013991-7795-499b-b7f0-1637252df2b2 format-version: '2' diff --git a/.final_builds/packages/locket/index.yml b/.final_builds/packages/locket/index.yml index f7cceb24cb..4828626172 100644 --- a/.final_builds/packages/locket/index.yml +++ b/.final_builds/packages/locket/index.yml @@ -76,4 +76,8 @@ builds: version: f0327c8530f8dcf96930d35c0456149aa5ed63fe sha1: 24c0613a407b56a1d11d264b3dbd45a603258e8e blobstore_id: 15a26644-cc59-441c-97c1-c9c28f13653f + c175ba572774e7de3699f6f4792d1874a6c311ea: + version: c175ba572774e7de3699f6f4792d1874a6c311ea + sha1: 37bfd00827c3b890fe9a2b356b1f60432e330315 + blobstore_id: 5564e48c-8684-464c-841a-3e9a8c1c73db format-version: '2' diff --git a/.final_builds/packages/rep/index.yml b/.final_builds/packages/rep/index.yml index d520f0afad..ccf27d015d 100644 --- a/.final_builds/packages/rep/index.yml +++ b/.final_builds/packages/rep/index.yml @@ -1428,4 +1428,8 @@ builds: version: 48951016812411b17b1c62aa13ea1bf0f3f5479c sha1: 802f42740b63c239120ea2452ae51b78241c35d5 blobstore_id: 3279a206-aba7-40ca-8f8d-acdce56e21be + f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d: + version: f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d + sha1: 7fd6b8b8466ac3e7435611b0efd6883cff94c633 + blobstore_id: 7e601c07-9be8-4f63-ab75-4b2a3014c72a format-version: '2' diff --git a/.final_builds/packages/rep_windows/index.yml b/.final_builds/packages/rep_windows/index.yml index 6ddb6a1a79..f3ad138dce 100644 --- a/.final_builds/packages/rep_windows/index.yml +++ b/.final_builds/packages/rep_windows/index.yml @@ -192,4 +192,8 @@ builds: version: 6e25144f764c7b4167a469234e50582847a28822 sha1: 50caedd5a1343bce0013ec357ee998d9dfcf2184 blobstore_id: 62ef7831-efbd-457c-82d2-c9bf78f7a485 + ca26b06a8ce7615ef990d7d9f6392a4efc29346d: + version: ca26b06a8ce7615ef990d7d9f6392a4efc29346d + sha1: 74cbf7221b2f4aa3e897b495017c3647ab354508 + blobstore_id: 4ced2263-74a0-4be8-af14-34513c4e7dc6 format-version: '2' diff --git a/releases/diego-1.23.0.yml b/releases/diego-1.23.0.yml new file mode 100644 index 0000000000..36f1716a76 --- /dev/null +++ b/releases/diego-1.23.0.yml @@ -0,0 +1,187 @@ +--- +packages: +- name: auctioneer + version: 28a97f9b8a6769a0780df168be35d2c6153799b9 + fingerprint: 28a97f9b8a6769a0780df168be35d2c6153799b9 + sha1: 507c496605f8a69499d1bffbd7b272a434c2813a + dependencies: + - golang +- name: bbs + version: 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa + fingerprint: 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa + sha1: 5b5fd0e5f297f323710d6274a178edc12a82a8fe + dependencies: + - golang +- name: benchmark-bbs + version: 06fbc6c7741f2f9018f184a8fabf378967a0064b + fingerprint: 06fbc6c7741f2f9018f184a8fabf378967a0064b + sha1: e0d21eca295ab439a741cfde3d5f4ad480b354dc + dependencies: + - golang +- name: buildpack_app_lifecycle + version: ea41f1666258427696c033b8b8b23b789ded3115 + fingerprint: ea41f1666258427696c033b8b8b23b789ded3115 + sha1: 9e56b0d90d98c59a076d5ad8a7158512762991f1 + dependencies: + - diego-sshd + - golang + - healthcheck +- name: cfdot + version: 6354c1d785f2aef443958877ebe9f5264567dba1 + fingerprint: 6354c1d785f2aef443958877ebe9f5264567dba1 + sha1: 576dfb9e6c56e76fa5701b0eebb6e6b5a0883c66 + dependencies: + - golang +- name: diego-sshd + version: d2ebf26754a19b68eebb49d5b967efc33be2e45d + fingerprint: d2ebf26754a19b68eebb49d5b967efc33be2e45d + sha1: 9d81e3900361df2a29631422ce3656f8b5b94276 + dependencies: + - golang +- name: docker_app_lifecycle + version: bbe7d156987f3ff9108b2732b457fd4b037043fd + fingerprint: bbe7d156987f3ff9108b2732b457fd4b037043fd + sha1: 494f029ea2fe4b11f92fc16d8030e8fd426c2c13 + dependencies: + - diego-sshd + - golang + - healthcheck +- name: file_server + version: acc0f630405c5bc158cb2e15895f2e11a6cd03ee + fingerprint: acc0f630405c5bc158cb2e15895f2e11a6cd03ee + sha1: 9f5dcf24bca69106015371f05a0f6fb1b1789fca + dependencies: + - golang +- name: golang-windows + version: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 + fingerprint: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 + sha1: bd627bc213dd1d2c207ce469540c8c915139fcc0 + dependencies: [] +- name: golang + version: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 + fingerprint: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 + sha1: 958c65e49f9457ecc08f028a1aea3c94651eada6 + dependencies: [] +- name: healthcheck + version: 9cf72206a74667125ff277cc24635868e2dc2339 + fingerprint: 9cf72206a74667125ff277cc24635868e2dc2339 + sha1: e7cd74b0e081e771df08935ef06f2488e40b34e3 + dependencies: + - golang +- name: healthcheck_windows + version: b01597a98498c20b30f81668369bfc60c1f5fc74 + fingerprint: b01597a98498c20b30f81668369bfc60c1f5fc74 + sha1: ed4bc37bbd4bb169ac75a3717eeeb4e18145698d + dependencies: + - golang-windows +- name: locket + version: c175ba572774e7de3699f6f4792d1874a6c311ea + fingerprint: c175ba572774e7de3699f6f4792d1874a6c311ea + sha1: 37bfd00827c3b890fe9a2b356b1f60432e330315 + dependencies: + - golang +- name: pid_utils + version: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 + fingerprint: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 + sha1: 6ada005648f7f631cd9fef1685574e27be88c913 + dependencies: [] +- name: rep + version: f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d + fingerprint: f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d + sha1: 7fd6b8b8466ac3e7435611b0efd6883cff94c633 + dependencies: + - golang +- name: rep_windows + version: ca26b06a8ce7615ef990d7d9f6392a4efc29346d + fingerprint: ca26b06a8ce7615ef990d7d9f6392a4efc29346d + sha1: 74cbf7221b2f4aa3e897b495017c3647ab354508 + dependencies: + - golang-windows +- name: route_emitter + version: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e + fingerprint: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e + sha1: 7abadbc1eb972b2a0738b77d2ded0ea979c07494 + dependencies: + - golang +- name: route_emitter_windows + version: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 + fingerprint: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 + sha1: c0cc10917c7c2900f8ebe7e663810d280a8d333a + dependencies: + - golang-windows +- name: ssh_proxy + version: 3d37c0edadad1418071ba2d59231ab424fac6833 + fingerprint: 3d37c0edadad1418071ba2d59231ab424fac6833 + sha1: 0561aa0de62fb3b8ed8b63ad2514667756ea1848 + dependencies: + - golang +- name: vizzini + version: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b + fingerprint: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b + sha1: a400ceb9966cd3bfc87f47f24ed1b9e47d38eab6 + dependencies: + - golang +- name: windows_app_lifecycle + version: b611468c8a02374fd18609608bf8703519a23aa4 + fingerprint: b611468c8a02374fd18609608bf8703519a23aa4 + sha1: 09a5fcc7d73a7f8af73715cf634076a1ca4264d2 + dependencies: + - diego-sshd + - healthcheck +jobs: +- name: auctioneer + version: 098f17c636e82c8f1bffcf7524ccbec85ba0026c + fingerprint: 098f17c636e82c8f1bffcf7524ccbec85ba0026c + sha1: 03f69d701eaa269a9f583754e0bd2b2a5ca822fa +- name: bbs + version: 85652b024b54f0e9f248bb61766ea321814a17ba + fingerprint: 85652b024b54f0e9f248bb61766ea321814a17ba + sha1: 767771de54da120681c6ab7c62edbb5fb0c154e6 +- name: benchmark-bbs + version: e023423f093d3ce5be53bbce30b4823852506078 + fingerprint: e023423f093d3ce5be53bbce30b4823852506078 + sha1: 8748824ae24919bed064ee1cda208b993b52a6fb +- name: cfdot + version: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 + fingerprint: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 + sha1: ec3a4f1ef05c1638d4e4f12fe630a34d27e9fc4d +- name: file_server + version: de829eb0408806028a4010c6018f3e87b5190c05 + fingerprint: de829eb0408806028a4010c6018f3e87b5190c05 + sha1: 30bcef30b16d1445dc7e6b92dc4c7a015f5975e5 +- name: locket + version: f4f379943bab0f5fa0a9727d82b91760eb52a81e + fingerprint: f4f379943bab0f5fa0a9727d82b91760eb52a81e + sha1: 8b964808937f54c50c684506d7d89d84e5270b2c +- name: rep + version: 40bec4155435ff4f93a09be9e68117b0302e4ae1 + fingerprint: 40bec4155435ff4f93a09be9e68117b0302e4ae1 + sha1: f1a43af2fbf4c86589ba9db52a97d8c808704c8e +- name: rep_windows + version: 51f58a23232c83708338d65b76ce141c9ee62083 + fingerprint: 51f58a23232c83708338d65b76ce141c9ee62083 + sha1: af3253f303d17bcbdc91c551d65096d4648a6b56 +- name: route_emitter + version: 7252da78169a5bc463bdeee2d946a3aacd15dd44 + fingerprint: 7252da78169a5bc463bdeee2d946a3aacd15dd44 + sha1: eb7f90768dbec774ffa9f60126ca6225d8dff5db +- name: route_emitter_windows + version: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 + fingerprint: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 + sha1: 9021e27b20a00503409e1723616c0fef301c639d +- name: ssh_proxy + version: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d + fingerprint: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d + sha1: bd2649784bd2db2b62f4217bd48cf2e6f3307184 +- name: vizzini + version: 6b951848a1d8095e11cc360956a001aeae97a345 + fingerprint: 6b951848a1d8095e11cc360956a001aeae97a345 + sha1: 0b06815364973f67a988658f4776bb7eb1c3d8d0 +license: + version: e5665430b5aafd47589f9df4e2345684d3924831 + fingerprint: e5665430b5aafd47589f9df4e2345684d3924831 + sha1: 3dbb1fe81392fb1ff3a58cbaa3f7e05b6980e6b3 +commit_hash: edb126ad +uncommitted_changes: false +name: diego +version: 1.23.0 diff --git a/releases/index.yml b/releases/index.yml index 04a2f1c5c0..9815860894 100644 --- a/releases/index.yml +++ b/releases/index.yml @@ -1304,4 +1304,6 @@ builds: version: 1.21.0 42025cd2-b2a2-4344-91e3-b145aeb8eb4d: version: 1.22.0 + ea312499-ce6e-49f9-bfe4-69a076c636c9: + version: 1.23.0 format-version: '2' From d3ddf877f10fd8b77484696e82d830c188e91c1a Mon Sep 17 00:00:00 2001 From: Swetha Repakula Date: Mon, 17 Jul 2017 15:35:47 -0400 Subject: [PATCH 26/37] bump diego-upgrade-stability-tests Submodule src/code.cloudfoundry.org/diego-upgrade-stability-tests d699df13..de19faf1: > replace expired certs with new ones > Remove a comment that isn't valid anymore > Run dora that is part of cf-release Signed-off-by: John Shahid --- src/code.cloudfoundry.org/diego-upgrade-stability-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/diego-upgrade-stability-tests b/src/code.cloudfoundry.org/diego-upgrade-stability-tests index d699df1322..de19faf1a6 160000 --- a/src/code.cloudfoundry.org/diego-upgrade-stability-tests +++ b/src/code.cloudfoundry.org/diego-upgrade-stability-tests @@ -1 +1 @@ -Subproject commit d699df13224b90face45d65772301464969f14fc +Subproject commit de19faf1a63303d6ef056ca46822ae33c89059a9 From df22436328e1c8134309fe914f415cae3deb7613 Mon Sep 17 00:00:00 2001 From: Anoop Gopalakrishnan Date: Mon, 17 Jul 2017 16:13:03 -0400 Subject: [PATCH 27/37] bump vizzini Submodule src/code.cloudfoundry.org/vizzini 3e2396f..d39bf47: > Remove "crashed" and semicolons from crashes_test. Signed-off-by: Brandon Shroyer --- src/code.cloudfoundry.org/vizzini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/vizzini b/src/code.cloudfoundry.org/vizzini index 3e2396f519..d39bf47d7f 160000 --- a/src/code.cloudfoundry.org/vizzini +++ b/src/code.cloudfoundry.org/vizzini @@ -1 +1 @@ -Subproject commit 3e2396f519ced792968a4df53f9099a2e5088415 +Subproject commit d39bf47d7f48c9263031d8384015b31499bf372b From 0a5c460bd6a30c2e93afe5b3f041b83c7f18ebdb Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Wed, 19 Jul 2017 11:31:07 -0700 Subject: [PATCH 28/37] bump inigo [finishes #147942705] Submodule src/code.cloudfoundry.org/inigo fc9ddf54..871ef344: > improved assertions in inigo --- src/code.cloudfoundry.org/inigo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/inigo b/src/code.cloudfoundry.org/inigo index fc9ddf54b3..871ef3448d 160000 --- a/src/code.cloudfoundry.org/inigo +++ b/src/code.cloudfoundry.org/inigo @@ -1 +1 @@ -Subproject commit fc9ddf54b3ad8084171a98f0c8bd654ca663eb5f +Subproject commit 871ef3448d7e5b5408d3cb478639c22ecc359075 From f56d174d216e662cd75635c366e719d85abacdb4 Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Wed, 19 Jul 2017 11:31:49 -0700 Subject: [PATCH 29/37] bump diego-ssh [finishes #149173035] Submodule src/code.cloudfoundry.org/diego-ssh d0a23d38..5c819b8d: > fix flakey tests --- src/code.cloudfoundry.org/diego-ssh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/diego-ssh b/src/code.cloudfoundry.org/diego-ssh index d0a23d3864..5c819b8d17 160000 --- a/src/code.cloudfoundry.org/diego-ssh +++ b/src/code.cloudfoundry.org/diego-ssh @@ -1 +1 @@ -Subproject commit d0a23d38644b8f2206d0c4a5448c768f7f05eee5 +Subproject commit 5c819b8d17914d464a99e3c367f671075419064a From a3ca7a2937d28b559f7b6603a080f04ba4190488 Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Wed, 19 Jul 2017 11:34:12 -0700 Subject: [PATCH 30/37] bump workpool [finishes #148290349] Submodule src/code.cloudfoundry.org/workpool 0e2024d2..99757edb: > Remove contraction of idle workers in the workpool --- src/code.cloudfoundry.org/workpool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code.cloudfoundry.org/workpool b/src/code.cloudfoundry.org/workpool index 0e2024d2a9..99757edba7 160000 --- a/src/code.cloudfoundry.org/workpool +++ b/src/code.cloudfoundry.org/workpool @@ -1 +1 @@ -Subproject commit 0e2024d2a925068519f6ba470d11f8b735ecd4f4 +Subproject commit 99757edba73523adac0d2460f4c3555f938663b5 From 894eea3b4bb2d6c479209163b50c2a0fd5fe7fca Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Wed, 19 Jul 2017 11:37:03 -0700 Subject: [PATCH 31/37] bump executor inigo [finishes #148635285] Submodule src/code.cloudfoundry.org/executor fe7ee145..8140a969: > Prefix log source to run action error message > update counterfeiter fakes Submodule src/code.cloudfoundry.org/inigo 871ef3448..5b946d72d: > update inigo tests with log source for run actions --- src/code.cloudfoundry.org/executor | 2 +- src/code.cloudfoundry.org/inigo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code.cloudfoundry.org/executor b/src/code.cloudfoundry.org/executor index fe7ee14598..8140a9696b 160000 --- a/src/code.cloudfoundry.org/executor +++ b/src/code.cloudfoundry.org/executor @@ -1 +1 @@ -Subproject commit fe7ee14598b25d6a75f21f8c8d394e2607a69b1f +Subproject commit 8140a9696b51f94c4317665f93933cbe5119f16a diff --git a/src/code.cloudfoundry.org/inigo b/src/code.cloudfoundry.org/inigo index 871ef3448d..5b946d72d1 160000 --- a/src/code.cloudfoundry.org/inigo +++ b/src/code.cloudfoundry.org/inigo @@ -1 +1 @@ -Subproject commit 871ef3448d7e5b5408d3cb478639c22ecc359075 +Subproject commit 5b946d72d1ab39d4ba6a04013938043406ed13a7 From de0822d562ed8ce4249cc043799aa3106a3941d3 Mon Sep 17 00:00:00 2001 From: Eric Malm Date: Thu, 20 Jul 2017 01:02:38 -0700 Subject: [PATCH 32/37] examples/aws: minor revisions [#148322889] --- examples/aws/README.md | 118 +++++++++--------- .../templates/mysql/mysql-overrides-ops.yml | 14 +-- 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/examples/aws/README.md b/examples/aws/README.md index 0bf7c8a74f..327e09a0de 100644 --- a/examples/aws/README.md +++ b/examples/aws/README.md @@ -841,55 +841,56 @@ configurations. All configurations have the same starting steps: 1. Edit or create `$DEPLOYMENT_DIR/stubs/aws-instance-types.yml` to optionally have the following: - ``` yaml - instance_types: - mysql_database: m3.medium # replace with the instance type of the mysql database - mysql_proxy: m3.medium # replace with the instance type of the mysql proxy - mysql_persistent_disk_iops: 1000 # Only set this value if the disk_type is io1 - mysql_persistent_disk_type: gp2 # replace with the disk type of the mysql database - ``` + ```yaml + instance_types: + mysql_database: m3.medium # replace with the instance type of the mysql database + mysql_proxy: m3.medium # replace with the instance type of the mysql proxy + mysql_persistent_disk_iops: 1000 # Only set this value if the disk_type is io1 + mysql_persistent_disk_type: gp2 # replace with the disk type of the mysql database + ``` 1. Clone the [cf-mysql-deployment](https://github.com/cloudfoundry/cf-mysql-deployment) `release-candidate` branch: - ```bash - git clone -b release-candidate https://github.com/cloudfoundry/cf-mysql-deployment - ``` + ```bash + cd $HOME/workspace + git clone -b release-candidate https://github.com/cloudfoundry/cf-mysql-deployment + export CF_MYSQL_DEPLOYMENT_DIR=$HOME/workspace/cf-mysql-deployment + ``` -1. Rename the deployment in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: +1. Edit the `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml` generated by the `deploy_aws_environment` script to rename the CF-MySQL deployment: - ```yml - - type: replace + ```yaml + - type: replace path: /name - value: "DEPLOYMENT_NAME" - ``` - -1. Edit consul ip addresses and encryption key by editing `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + value: "REPLACE_WITH_CF_MYSQL_DEPLOYMENT_NAME" + ``` - ```yml - - type: replace - path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/encrypt_keys - value: - REPLACE_WITH_CONSUL_ENCRYPT_KEYS - - type: replace - path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/agent/servers/lan - value: - REPLACE_WITH_CONSUL_SERVER_IPS - ``` +1. Set the Consul IP addresses and encryption keys in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + + ```yaml + - type: replace + path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/encrypt_keys + value: + REPLACE_WITH_CONSUL_ENCRYPT_KEYS + - type: replace + path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/agent/servers/lan + value: + REPLACE_WITH_CONSUL_SERVER_IPS + ``` -Consul ip addresses can be found by running `bosh vms | grep consul` +The Consul IP addresses can be found by running `bosh vms | grep consul` or by inspecting the static IP addresses in the `consul_z1` and `consul_z2` jobs in the CF manifest. 1. Edit the database passwords in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: - ```yml - - type: replace - path: /properties/cf_mysql/mysql/seeded_databases? - value: - - name: diego - username: diego - password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD - - name: locket - username: locket - password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD - + ```yaml + - type: replace + path: /properties/cf_mysql/mysql/seeded_databases? + value: + - name: diego + username: diego + password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD + - name: locket + username: locket + password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD ``` After that you can deploy the CF-MySQL release in either mode: @@ -908,17 +909,17 @@ If you have used the old style [manifest generation](https://github.com/cloudfou 1. Add the following to `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: - ```yml -- type: replace - path: /instance_groups/name=proxy/instances? - value: 0 -- type: replace - path: /instance_groups/name=arbitrator/instances? - value: 0 -- type: replace - path: /instance_groups/name=mysql/instances? - value: 1 - ``` + ```yaml + - type: replace + path: /instance_groups/name=proxy/instances? + value: 0 + - type: replace + path: /instance_groups/name=arbitrator/instances? + value: 0 + - type: replace + path: /instance_groups/name=mysql/instances? + value: 1 + ``` #### Highly Available CF-MySQL @@ -934,15 +935,16 @@ No changes are required since the default manifest deploys highly available CF-M 1. Deploy: - ```bash - bosh -d deploy cf-mysql-deployment/cf-mysql-deployment.yml \ - --vars-file $DEPLOYMENT_DIR/stubs/cf-mysql/consul-secrets.yml \ - --vars-store $DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml \ - -o cf-mysql-deployment/operations/proxy-consul.yml \ - -o $DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml --no-redact - ``` + ```bash + bosh -d deploy \ + $CF_MYSQL_DEPLOYMENT_DIR/cf-mysql-deployment.yml \ + --vars-file $DEPLOYMENT_DIR/stubs/cf-mysql/consul-secrets.yml \ + --vars-store $DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml \ + -o $CF_MYSQL_DEPLOYMENT_DIR/operations/proxy-consul.yml \ + -o $DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml --no-redact + ``` -**NOTE** this command will store some credentials in `$DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml` make sure you commit this file. +**NOTE**: This command will create the `$DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml` file and store generated credentials in it, so make sure you commit this file. ### Use the PostgreSQL job from CF-Release diff --git a/examples/aws/templates/mysql/mysql-overrides-ops.yml b/examples/aws/templates/mysql/mysql-overrides-ops.yml index 035bd53444..37ae65afdb 100644 --- a/examples/aws/templates/mysql/mysql-overrides-ops.yml +++ b/examples/aws/templates/mysql/mysql-overrides-ops.yml @@ -1,6 +1,6 @@ - type: replace path: /name - value: "REPLACE_WITH_DEPLOYMENT_NAME" + value: "REPLACE_WITH_CF_MYSQL_DEPLOYMENT_NAME" - type: replace path: /properties/cf_mysql/mysql/innodb_flush_log_at_trx_commit? value: 0 @@ -65,9 +65,9 @@ - type: replace path: /properties/cf_mysql/mysql/seeded_databases? value: - - name: diego - username: diego - password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD - - name: locket - username: locket - password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD + - name: diego + username: diego + password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD + - name: locket + username: locket + password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD From 6764251144170b04295f10393c37798095f95e75 Mon Sep 17 00:00:00 2001 From: encalada Date: Tue, 4 Jul 2017 13:23:03 +0200 Subject: [PATCH 33/37] refactoring auctioneer server tls enablement, to be more adhoc to the rep and bbs approach --- docs/tls-configuration.md | 15 ++++++--------- jobs/auctioneer/spec | 3 +++ jobs/auctioneer/templates/auctioneer.json.erb | 2 +- jobs/auctioneer/templates/auctioneer_ca.crt.erb | 6 +++++- .../templates/auctioneer_server.crt.erb | 6 +++++- .../templates/auctioneer_server.key.erb | 6 +++++- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/docs/tls-configuration.md b/docs/tls-configuration.md index f1329dea89..e275f50c95 100644 --- a/docs/tls-configuration.md +++ b/docs/tls-configuration.md @@ -12,15 +12,12 @@ the rep servers on the cell vms, via the `diego.rep.require_tls` and `false`. When enabled, the operator must provide TLS certificates and keys for the rep server and its clients (other components in the Diego deployment). -TLS with mutual authentication can be enabled for communication to the Auctioneer -server, via the presence of any of the following properties: `diego.auctioneer.ca_cert`, -`diego.auctioneer.server_cert`, `diego.auctioneer.server_key`. If TLS is enabled for -the Auctioneer, the operator must also specify the client certificates and keys -required for mutual authentication in the following properties: `diego.bbs.auctioneer.ca_cert`, -`diego.bbs.auctioneer.client_cert`, `diego.bbs.auctioneer.client_key`. -The operator may also set `diego.bbs.auctioneer.require_tls` to `true` to ensure -that all communication between the BBS and the Auctioneer server is secured using TLS -with mutual authentication. + +TLS with mutual authentication can be enabled for communication to +the Auctioneer server, via the `diego.auctioneer.require_tls` and +`diego.bbs.auctioneer.require_tls` BOSH properties. These properties default to +`false`. When enabled, the operator must provide TLS certificates and keys for +the Auctioneer server and the BBS client. TLS with mutual authentication can be enabled for upload and download of assets into the containers, via the presence of the following properties: diff --git a/jobs/auctioneer/spec b/jobs/auctioneer/spec index acac9ffbec..18ce7605de 100644 --- a/jobs/auctioneer/spec +++ b/jobs/auctioneer/spec @@ -24,6 +24,9 @@ packages: - auctioneer properties: + diego.auctioneer.require_tls: + description: "Whether to require mutual TLS for communication to the securable auctioneer API server" + default: false diego.auctioneer.ca_cert: description: "PEM-encoded CA certificate for the auctioneer API server." diego.auctioneer.server_cert: diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index 12e7ce6941..27e9c00a3c 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -2,6 +2,7 @@ conf_dir = "/var/vcap/jobs/auctioneer/config" config = { + require_tls: p("diego.auctioneer.require_tls"), dropsonde_port: p("diego.auctioneer.dropsonde_port"), consul_cluster: "http://127.0.0.1:8500", debug_address: p("diego.auctioneer.debug_addr"), @@ -40,7 +41,6 @@ if p("diego.auctioneer.ca_cert", "") != "" || p("diego.auctioneer.server_cert", "") != "" || p("diego.auctioneer.server_key", "") != "" config[:ca_cert_file] = "#{conf_dir}/certs/auctioneer/ca.crt" config[:server_cert_file] = "#{conf_dir}/certs/auctioneer/server.crt" - config[:server_key_file] = "#{conf_dir}/certs/auctioneer/server.key" end if_p("diego.auctioneer.locket.api_location") do |value| diff --git a/jobs/auctioneer/templates/auctioneer_ca.crt.erb b/jobs/auctioneer/templates/auctioneer_ca.crt.erb index 23a0e0b08b..1bf7690c2e 100644 --- a/jobs/auctioneer/templates/auctioneer_ca.crt.erb +++ b/jobs/auctioneer/templates/auctioneer_ca.crt.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.ca_cert") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.ca_cert") %> +<% else %> + <% if_p("diego.auctioneer.ca_cert") do |value| %> <%= value %> + <% end %> <% end %> diff --git a/jobs/auctioneer/templates/auctioneer_server.crt.erb b/jobs/auctioneer/templates/auctioneer_server.crt.erb index ce646ce247..193fd15e31 100644 --- a/jobs/auctioneer/templates/auctioneer_server.crt.erb +++ b/jobs/auctioneer/templates/auctioneer_server.crt.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.server_cert") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.server_cert") %> +<% else %> + <% if_p("diego.auctioneer.server_cert") do |value| %> <%= value %> + <% end %> <% end %> diff --git a/jobs/auctioneer/templates/auctioneer_server.key.erb b/jobs/auctioneer/templates/auctioneer_server.key.erb index 23d3f9e507..21aec118d7 100644 --- a/jobs/auctioneer/templates/auctioneer_server.key.erb +++ b/jobs/auctioneer/templates/auctioneer_server.key.erb @@ -1,3 +1,7 @@ -<% if_p("diego.auctioneer.server_key") do |value| %> +<% if p("diego.auctioneer.require_tls") %> +<%= p("diego.auctioneer.server_key") %> +<% else %> + <% if_p("diego.auctioneer.server_key") do |value| %> <%= value %> + <% end %> <% end %> From aad524e5c2fe7a70d848cb7414bfc6c486d803c3 Mon Sep 17 00:00:00 2001 From: encalada Date: Tue, 4 Jul 2017 13:23:03 +0200 Subject: [PATCH 34/37] refactoring auctioneer server tls enablement, to be more adhoc to the rep and bbs approach --- jobs/auctioneer/templates/auctioneer.json.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index 27e9c00a3c..1dae55d47d 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -41,6 +41,7 @@ if p("diego.auctioneer.ca_cert", "") != "" || p("diego.auctioneer.server_cert", "") != "" || p("diego.auctioneer.server_key", "") != "" config[:ca_cert_file] = "#{conf_dir}/certs/auctioneer/ca.crt" config[:server_cert_file] = "#{conf_dir}/certs/auctioneer/server.crt" + config[:server_key_file] = "#{conf_dir}/certs/auctioneer/server.key" end if_p("diego.auctioneer.locket.api_location") do |value| From 484a83de9114a00571e9462989adde41c0cf735c Mon Sep 17 00:00:00 2001 From: encalada Date: Thu, 20 Jul 2017 13:03:26 +0200 Subject: [PATCH 35/37] fixing conflicts due to commits in auctioneer.json.erb --- jobs/auctioneer/templates/auctioneer.json.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index 1dae55d47d..034d5f9581 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -38,7 +38,7 @@ config[:rep_ca_cert] = "#{conf_dir}/certs/rep/ca.crt" end - if p("diego.auctioneer.ca_cert", "") != "" || p("diego.auctioneer.server_cert", "") != "" || p("diego.auctioneer.server_key", "") != "" + if p("diego.auctioneer.require_tls") config[:ca_cert_file] = "#{conf_dir}/certs/auctioneer/ca.crt" config[:server_cert_file] = "#{conf_dir}/certs/auctioneer/server.crt" config[:server_key_file] = "#{conf_dir}/certs/auctioneer/server.key" @@ -48,7 +48,7 @@ config[:locket_address] = value config[:uuid] = spec.id config[:locket_ca_cert_file] = "#{conf_dir}/certs/bbs/ca.crt" - config[:locket_client_cert_file] = "#{conf_dir}/certs/bbs/client.crt" + config[:locket_client_cert_file] = "#{conf_dir}/cer ts/bbs/client.crt" config[:locket_client_key_file] = "#{conf_dir}/certs/bbs/client.key" end From cc0d2bfa77486f1b23657987e76d9086daaac66e Mon Sep 17 00:00:00 2001 From: encalada Date: Thu, 20 Jul 2017 13:04:34 +0200 Subject: [PATCH 36/37] fixing typo introduced by mistake --- jobs/auctioneer/templates/auctioneer.json.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index 034d5f9581..8067ba9773 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -48,7 +48,7 @@ config[:locket_address] = value config[:uuid] = spec.id config[:locket_ca_cert_file] = "#{conf_dir}/certs/bbs/ca.crt" - config[:locket_client_cert_file] = "#{conf_dir}/cer ts/bbs/client.crt" + config[:locket_client_cert_file] = "#{conf_dir}/certs/bbs/client.crt" config[:locket_client_key_file] = "#{conf_dir}/certs/bbs/client.key" end From 60012cacd14ee7686b31f035e8d69a6e1e51c54d Mon Sep 17 00:00:00 2001 From: encalada Date: Thu, 20 Jul 2017 13:14:33 +0200 Subject: [PATCH 37/37] reverting merge --- .final_builds/jobs/auctioneer/index.yml | 4 - .final_builds/jobs/bbs/index.yml | 4 - .final_builds/packages/auctioneer/index.yml | 8 - .final_builds/packages/bbs/index.yml | 8 - .../packages/benchmark-bbs/index.yml | 8 - .../buildpack_app_lifecycle/index.yml | 4 - .final_builds/packages/cfdot/index.yml | 8 - .final_builds/packages/diego-sshd/index.yml | 8 - .../packages/docker_app_lifecycle/index.yml | 4 - .final_builds/packages/healthcheck/index.yml | 4 - .../packages/healthcheck_windows/index.yml | 4 - .final_builds/packages/locket/index.yml | 8 - .final_builds/packages/rep/index.yml | 8 - .final_builds/packages/rep_windows/index.yml | 8 - .../packages/route_emitter/index.yml | 4 - .../packages/route_emitter_windows/index.yml | 4 - .final_builds/packages/ssh_proxy/index.yml | 4 - .final_builds/packages/vizzini/index.yml | 4 - .../packages/windows_app_lifecycle/index.yml | 4 - .gitmodules | 2 +- docs/metrics.md | 28 +-- examples/aws/README.md | 160 +++++++++------ examples/aws/deploy_aws_environment | 20 +- .../infrastructure/cloud-config-internal.yml | 100 ---------- .../templates/infrastructure/cloud-config.yml | 7 - .../aws/templates/mysql/consul-secrets.yml | 6 - .../mysql/iaas-settings-internal.yml | 117 +++++++++++ .../aws/templates/mysql/iaas-settings.yml | 1 + .../templates/mysql/mysql-overrides-ops.yml | 73 ------- jobs/auctioneer/spec | 16 -- jobs/auctioneer/templates/auctioneer.json.erb | 41 ++-- .../templates/loggregator_ca.crt.erb | 4 - .../templates/loggregator_client.crt.erb | 3 - .../templates/loggregator_client.key.erb | 4 - jobs/bbs/spec | 16 -- jobs/bbs/templates/bbs.json.erb | 15 -- jobs/bbs/templates/loggregator_ca.crt.erb | 4 - jobs/bbs/templates/loggregator_client.crt.erb | 3 - jobs/bbs/templates/loggregator_client.key.erb | 4 - manifest-generation/diego-windows.yml | 3 +- packages/auctioneer/spec | 24 --- packages/bbs/spec | 24 --- packages/benchmark-bbs/spec | 37 ---- packages/healthcheck/packaging | 2 - packages/rep/spec | 4 +- packages/rep_windows/spec | 4 +- packages/windows_app_lifecycle/packaging | 2 +- releases/diego-1.22.0.yml | 187 ------------------ releases/diego-1.23.0.yml | 187 ------------------ releases/index.yml | 4 - scripts/update | 6 +- src/code.cloudfoundry.org/auctioneer | 2 +- src/code.cloudfoundry.org/bbs | 2 +- src/code.cloudfoundry.org/benchmarkbbs | 2 +- .../buildpackapplifecycle | 2 +- src/code.cloudfoundry.org/cfdot | 2 +- src/code.cloudfoundry.org/diego-ssh | 2 +- .../diego-upgrade-stability-tests | 2 +- src/code.cloudfoundry.org/dockerapplifecycle | 2 +- src/code.cloudfoundry.org/executor | 2 +- src/code.cloudfoundry.org/go-loggregator | 2 +- src/code.cloudfoundry.org/guardian | 2 +- src/code.cloudfoundry.org/healthcheck | 2 +- src/code.cloudfoundry.org/inigo | 2 +- src/code.cloudfoundry.org/lager | 2 +- src/code.cloudfoundry.org/locket | 2 +- src/code.cloudfoundry.org/route-emitter | 2 +- src/code.cloudfoundry.org/vizzini | 2 +- src/code.cloudfoundry.org/workpool | 2 +- src/github.com/go-sql-driver/mysql | 2 +- 70 files changed, 275 insertions(+), 979 deletions(-) delete mode 100644 examples/aws/templates/infrastructure/cloud-config-internal.yml delete mode 100644 examples/aws/templates/infrastructure/cloud-config.yml delete mode 100644 examples/aws/templates/mysql/consul-secrets.yml create mode 100644 examples/aws/templates/mysql/iaas-settings-internal.yml create mode 100644 examples/aws/templates/mysql/iaas-settings.yml delete mode 100644 examples/aws/templates/mysql/mysql-overrides-ops.yml delete mode 100644 jobs/auctioneer/templates/loggregator_ca.crt.erb delete mode 100644 jobs/auctioneer/templates/loggregator_client.crt.erb delete mode 100644 jobs/auctioneer/templates/loggregator_client.key.erb delete mode 100644 jobs/bbs/templates/loggregator_ca.crt.erb delete mode 100644 jobs/bbs/templates/loggregator_client.crt.erb delete mode 100644 jobs/bbs/templates/loggregator_client.key.erb delete mode 100644 releases/diego-1.22.0.yml delete mode 100644 releases/diego-1.23.0.yml diff --git a/.final_builds/jobs/auctioneer/index.yml b/.final_builds/jobs/auctioneer/index.yml index b0905b1c77..ed27f52b53 100644 --- a/.final_builds/jobs/auctioneer/index.yml +++ b/.final_builds/jobs/auctioneer/index.yml @@ -188,8 +188,4 @@ builds: version: bd357fda056ec0f2edf29f0c9183dde36af99a93 sha1: affecabafe4f1273c34a6d9a6d70353a08158969 blobstore_id: fd685f15-4cf9-4b6f-8fa4-25e26a1efe13 - 098f17c636e82c8f1bffcf7524ccbec85ba0026c: - version: 098f17c636e82c8f1bffcf7524ccbec85ba0026c - sha1: 03f69d701eaa269a9f583754e0bd2b2a5ca822fa - blobstore_id: 11744c33-cbd0-427a-bd80-7af6de1ec58a format-version: '2' diff --git a/.final_builds/jobs/bbs/index.yml b/.final_builds/jobs/bbs/index.yml index f4a5759e14..7b9a441cbc 100644 --- a/.final_builds/jobs/bbs/index.yml +++ b/.final_builds/jobs/bbs/index.yml @@ -160,8 +160,4 @@ builds: version: cafe0e5eff944f26b960006a835356304e02f9e2 sha1: bfdfdc67aa0266ba90ba95c4e3462d3d0b85cea0 blobstore_id: e7fad5bb-2197-4564-bf91-88a39fec1048 - 85652b024b54f0e9f248bb61766ea321814a17ba: - version: 85652b024b54f0e9f248bb61766ea321814a17ba - sha1: 767771de54da120681c6ab7c62edbb5fb0c154e6 - blobstore_id: f5431177-0526-46f3-84c4-da932f264cb2 format-version: '2' diff --git a/.final_builds/packages/auctioneer/index.yml b/.final_builds/packages/auctioneer/index.yml index 32eb401824..235ca8bbdc 100644 --- a/.final_builds/packages/auctioneer/index.yml +++ b/.final_builds/packages/auctioneer/index.yml @@ -1280,12 +1280,4 @@ builds: version: 17bcf9d2715e0a22f3b754fec08d4f768d2b7b48 sha1: 35fd6bedfa22b925c1adbb071c6f1079e5394ced blobstore_id: 593b6e7a-c60c-4617-a4f0-52fb957b48fc - 20545141cea1e9edbcf2886587a373df85ac896f: - version: 20545141cea1e9edbcf2886587a373df85ac896f - sha1: 957ab48788b0ef3c5237d3b76b95e84b4104d512 - blobstore_id: 5b9fcb2e-a42e-4a19-92de-e87dc7f6db3e - 28a97f9b8a6769a0780df168be35d2c6153799b9: - version: 28a97f9b8a6769a0780df168be35d2c6153799b9 - sha1: 507c496605f8a69499d1bffbd7b272a434c2813a - blobstore_id: 296f4663-5bb8-4dc9-b813-77a0576e1592 format-version: '2' diff --git a/.final_builds/packages/bbs/index.yml b/.final_builds/packages/bbs/index.yml index c8ee5d9311..a9c51a4605 100644 --- a/.final_builds/packages/bbs/index.yml +++ b/.final_builds/packages/bbs/index.yml @@ -484,12 +484,4 @@ builds: version: c45fdcee7207f18158d60445cdd1a794c7177b1a sha1: 39e0f6def226c36c6d7b310634d3a83009c63079 blobstore_id: ceb70a22-3275-40c5-803f-a18541fd1271 - ec864334278588163141f484a045c88802e04724: - version: ec864334278588163141f484a045c88802e04724 - sha1: cf71eafe7a5d0c4a4fdb390488c135487a0d35c1 - blobstore_id: d3ad2956-84b8-41eb-acb8-1d387f6e42b1 - 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa: - version: 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa - sha1: 5b5fd0e5f297f323710d6274a178edc12a82a8fe - blobstore_id: 2ead2fb4-a1c0-4428-adc6-642a6f982ab2 format-version: '2' diff --git a/.final_builds/packages/benchmark-bbs/index.yml b/.final_builds/packages/benchmark-bbs/index.yml index c2b8b94552..d51f86a014 100644 --- a/.final_builds/packages/benchmark-bbs/index.yml +++ b/.final_builds/packages/benchmark-bbs/index.yml @@ -332,12 +332,4 @@ builds: version: 2e70bb0d558ca8ff1773925ba63a250b0684452a sha1: d6dea21bb8de59ca9dbb6670da2c7af97d8d281e blobstore_id: cc889a87-9090-45b7-8d55-48c67138cf10 - cc173e1d081296ba1aa2c2e63f8788032868d48d: - version: cc173e1d081296ba1aa2c2e63f8788032868d48d - sha1: 34feb0092672d7bc4b233eaa99cf4dce06b7bd12 - blobstore_id: 1171d64c-e035-4262-8ba0-16c709215883 - 06fbc6c7741f2f9018f184a8fabf378967a0064b: - version: 06fbc6c7741f2f9018f184a8fabf378967a0064b - sha1: e0d21eca295ab439a741cfde3d5f4ad480b354dc - blobstore_id: 4e2a79db-e641-4792-8b7a-73009b256710 format-version: '2' diff --git a/.final_builds/packages/buildpack_app_lifecycle/index.yml b/.final_builds/packages/buildpack_app_lifecycle/index.yml index c542187915..5d42e1aa15 100644 --- a/.final_builds/packages/buildpack_app_lifecycle/index.yml +++ b/.final_builds/packages/buildpack_app_lifecycle/index.yml @@ -188,8 +188,4 @@ builds: version: 5689eeb118926f586e15bffd8b58bb1b3c0f223c sha1: 3d847899504df650ca4df6b6202a336b7c4a04ea blobstore_id: 9b2aa0d2-3d06-4ed3-8772-da26dd7e8847 - ea41f1666258427696c033b8b8b23b789ded3115: - version: ea41f1666258427696c033b8b8b23b789ded3115 - sha1: 9e56b0d90d98c59a076d5ad8a7158512762991f1 - blobstore_id: 1da2f0e9-f96d-469b-b19c-2d92a296890a format-version: '2' diff --git a/.final_builds/packages/cfdot/index.yml b/.final_builds/packages/cfdot/index.yml index 6bac07952e..059abd1ccd 100644 --- a/.final_builds/packages/cfdot/index.yml +++ b/.final_builds/packages/cfdot/index.yml @@ -132,12 +132,4 @@ builds: version: af63ed12b4569a03bfda64d9c473f359b69f7049 sha1: 2193311205824e4c1b7ac16287867f245c8cd18d blobstore_id: 30ec1ef6-50e5-49d4-b182-4961de5bd398 - dcfa79035c570c22eb57c27f79bf711688345e3a: - version: dcfa79035c570c22eb57c27f79bf711688345e3a - sha1: 5a61cc1d943c8493108db04f259807532e2cd021 - blobstore_id: 132a79ec-44f3-4c00-861a-7868a57aa8b5 - 6354c1d785f2aef443958877ebe9f5264567dba1: - version: 6354c1d785f2aef443958877ebe9f5264567dba1 - sha1: 576dfb9e6c56e76fa5701b0eebb6e6b5a0883c66 - blobstore_id: 3629278d-160f-4c35-89cb-1c6f05bfd89f format-version: '2' diff --git a/.final_builds/packages/diego-sshd/index.yml b/.final_builds/packages/diego-sshd/index.yml index bd3c3b236c..0c545dd7b1 100644 --- a/.final_builds/packages/diego-sshd/index.yml +++ b/.final_builds/packages/diego-sshd/index.yml @@ -560,12 +560,4 @@ builds: version: aa4552968bbe9591525d21dced6512e4e8cc4f45 sha1: 30370808c41c0b92a48b200de21c52abc5d16822 blobstore_id: 4e04b392-b270-4365-9d9a-3b05211852ed - e926fd1bd1da3bab5c78e530cfe68932c5831674: - version: e926fd1bd1da3bab5c78e530cfe68932c5831674 - sha1: b60e89c00a548834e9b8e9104541c191e8fc11c9 - blobstore_id: 70a4ee76-d544-4f1d-8b7f-b166d948083c - d2ebf26754a19b68eebb49d5b967efc33be2e45d: - version: d2ebf26754a19b68eebb49d5b967efc33be2e45d - sha1: 9d81e3900361df2a29631422ce3656f8b5b94276 - blobstore_id: 3494ab02-63b7-4b0f-baf6-fa3ba45ac389 format-version: '2' diff --git a/.final_builds/packages/docker_app_lifecycle/index.yml b/.final_builds/packages/docker_app_lifecycle/index.yml index ed9b523d0d..1d3e1ad847 100644 --- a/.final_builds/packages/docker_app_lifecycle/index.yml +++ b/.final_builds/packages/docker_app_lifecycle/index.yml @@ -152,8 +152,4 @@ builds: version: f87324f504027becdb6f931da090264713ad0086 sha1: 25bbc31eec8699c81e97dea749fd5b0ae29b68be blobstore_id: 885dabcc-8197-427a-ac85-8e2f9529b956 - bbe7d156987f3ff9108b2732b457fd4b037043fd: - version: bbe7d156987f3ff9108b2732b457fd4b037043fd - sha1: 494f029ea2fe4b11f92fc16d8030e8fd426c2c13 - blobstore_id: 3c013991-7795-499b-b7f0-1637252df2b2 format-version: '2' diff --git a/.final_builds/packages/healthcheck/index.yml b/.final_builds/packages/healthcheck/index.yml index a340d9e207..5c977370af 100644 --- a/.final_builds/packages/healthcheck/index.yml +++ b/.final_builds/packages/healthcheck/index.yml @@ -60,8 +60,4 @@ builds: version: c553568996b76b4acd73fc48aed880524d678fe1 sha1: f026b048f5dc1b9c06ab52e10cf2ce32a27e6e77 blobstore_id: 06215bd6-277a-4e72-b6e3-e950ea82ed51 - 9cf72206a74667125ff277cc24635868e2dc2339: - version: 9cf72206a74667125ff277cc24635868e2dc2339 - sha1: e7cd74b0e081e771df08935ef06f2488e40b34e3 - blobstore_id: 38342952-df0c-4aa3-b1ca-9baae3d6e873 format-version: '2' diff --git a/.final_builds/packages/healthcheck_windows/index.yml b/.final_builds/packages/healthcheck_windows/index.yml index d06f429293..527429c1b1 100644 --- a/.final_builds/packages/healthcheck_windows/index.yml +++ b/.final_builds/packages/healthcheck_windows/index.yml @@ -8,8 +8,4 @@ builds: version: 088377b44523b4149143756981af47db01dcac62 sha1: 7ca3956b7440a64024c58dce21750374f859be91 blobstore_id: 13aa87d3-392e-452e-8ba8-3ce74b3a45ce - b01597a98498c20b30f81668369bfc60c1f5fc74: - version: b01597a98498c20b30f81668369bfc60c1f5fc74 - sha1: ed4bc37bbd4bb169ac75a3717eeeb4e18145698d - blobstore_id: 4e4f6175-0e76-4222-8326-657dc9a0432b format-version: '2' diff --git a/.final_builds/packages/locket/index.yml b/.final_builds/packages/locket/index.yml index 4828626172..68e77610dc 100644 --- a/.final_builds/packages/locket/index.yml +++ b/.final_builds/packages/locket/index.yml @@ -72,12 +72,4 @@ builds: version: e2872bed2262fe1233a5d5178cf85d7cee9b7eeb sha1: ad69bd191e1293814b7b1953976d89ff59be5e13 blobstore_id: 64b7dd44-5606-4a10-a324-45ba3a8d6985 - f0327c8530f8dcf96930d35c0456149aa5ed63fe: - version: f0327c8530f8dcf96930d35c0456149aa5ed63fe - sha1: 24c0613a407b56a1d11d264b3dbd45a603258e8e - blobstore_id: 15a26644-cc59-441c-97c1-c9c28f13653f - c175ba572774e7de3699f6f4792d1874a6c311ea: - version: c175ba572774e7de3699f6f4792d1874a6c311ea - sha1: 37bfd00827c3b890fe9a2b356b1f60432e330315 - blobstore_id: 5564e48c-8684-464c-841a-3e9a8c1c73db format-version: '2' diff --git a/.final_builds/packages/rep/index.yml b/.final_builds/packages/rep/index.yml index ccf27d015d..f82b363ee7 100644 --- a/.final_builds/packages/rep/index.yml +++ b/.final_builds/packages/rep/index.yml @@ -1424,12 +1424,4 @@ builds: version: 5ef26ef1838746e7f10a8d8982a4f3f2e991b3de sha1: 58365493594015ade2c402b0bd65d56e6c104c7c blobstore_id: a7491660-83d3-4ddf-a728-45837b6d8398 - 48951016812411b17b1c62aa13ea1bf0f3f5479c: - version: 48951016812411b17b1c62aa13ea1bf0f3f5479c - sha1: 802f42740b63c239120ea2452ae51b78241c35d5 - blobstore_id: 3279a206-aba7-40ca-8f8d-acdce56e21be - f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d: - version: f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d - sha1: 7fd6b8b8466ac3e7435611b0efd6883cff94c633 - blobstore_id: 7e601c07-9be8-4f63-ab75-4b2a3014c72a format-version: '2' diff --git a/.final_builds/packages/rep_windows/index.yml b/.final_builds/packages/rep_windows/index.yml index f3ad138dce..b32ea7936d 100644 --- a/.final_builds/packages/rep_windows/index.yml +++ b/.final_builds/packages/rep_windows/index.yml @@ -188,12 +188,4 @@ builds: version: ca67e1ccb5c9d85f3b7feee6539dd99f2d5787ce sha1: eccaf50be54e34173b17fba24e79c5b95a4ea081 blobstore_id: 4df2670b-4b0e-418c-95e3-a68bbed8f3e2 - 6e25144f764c7b4167a469234e50582847a28822: - version: 6e25144f764c7b4167a469234e50582847a28822 - sha1: 50caedd5a1343bce0013ec357ee998d9dfcf2184 - blobstore_id: 62ef7831-efbd-457c-82d2-c9bf78f7a485 - ca26b06a8ce7615ef990d7d9f6392a4efc29346d: - version: ca26b06a8ce7615ef990d7d9f6392a4efc29346d - sha1: 74cbf7221b2f4aa3e897b495017c3647ab354508 - blobstore_id: 4ced2263-74a0-4be8-af14-34513c4e7dc6 format-version: '2' diff --git a/.final_builds/packages/route_emitter/index.yml b/.final_builds/packages/route_emitter/index.yml index e370b39dc3..abe2da7b98 100644 --- a/.final_builds/packages/route_emitter/index.yml +++ b/.final_builds/packages/route_emitter/index.yml @@ -1288,8 +1288,4 @@ builds: version: c922933b5007aa645c80f55e2a361781dcd9feb9 sha1: b4dd7aa82ed65dc4d0a6d82f3184f4adb1e2f036 blobstore_id: a632083a-274a-40ec-a017-74a4d788a0f4 - 1c654f8eb890ea8f0facc7a6cfba03772c7d337e: - version: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e - sha1: 7abadbc1eb972b2a0738b77d2ded0ea979c07494 - blobstore_id: 80af9f3f-81ec-46e6-8e3c-745ca6523530 format-version: '2' diff --git a/.final_builds/packages/route_emitter_windows/index.yml b/.final_builds/packages/route_emitter_windows/index.yml index 4764a9fc48..beb3cbddae 100644 --- a/.final_builds/packages/route_emitter_windows/index.yml +++ b/.final_builds/packages/route_emitter_windows/index.yml @@ -104,8 +104,4 @@ builds: version: 869840921022639f9e8423c6f23546f36c793c0c sha1: 859a82461a40abc35415a80a2980e573957ff13c blobstore_id: fe0b6aef-7dc9-47b9-a53e-5d9dd1e735d3 - 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2: - version: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 - sha1: c0cc10917c7c2900f8ebe7e663810d280a8d333a - blobstore_id: 1debbe2c-9916-4de7-aa9a-baf558e9d841 format-version: '2' diff --git a/.final_builds/packages/ssh_proxy/index.yml b/.final_builds/packages/ssh_proxy/index.yml index 36d48ff073..22815390dc 100644 --- a/.final_builds/packages/ssh_proxy/index.yml +++ b/.final_builds/packages/ssh_proxy/index.yml @@ -520,8 +520,4 @@ builds: version: da45d1382da0eb7ffb94b4e8d2a09c7cc0fdcb16 sha1: 6bf0e6a36457edf244ebc2e0ba5cbb71fad8e8e6 blobstore_id: ca3a4469-fa29-4a96-a34d-7d40af3a78a0 - 3d37c0edadad1418071ba2d59231ab424fac6833: - version: 3d37c0edadad1418071ba2d59231ab424fac6833 - sha1: 0561aa0de62fb3b8ed8b63ad2514667756ea1848 - blobstore_id: 0a95865a-2044-4a8b-b687-35f30a3a0573 format-version: '2' diff --git a/.final_builds/packages/vizzini/index.yml b/.final_builds/packages/vizzini/index.yml index 2cd9b2a08d..d1436d00fc 100644 --- a/.final_builds/packages/vizzini/index.yml +++ b/.final_builds/packages/vizzini/index.yml @@ -284,8 +284,4 @@ builds: version: 2f5711124bc1edd849c17ed788232392ee292ab8 sha1: 0363b4cae90cd166c2ae83cd76b86cd0294a020b blobstore_id: fab1937b-6311-443d-9ed6-9ab4acd71daf - fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b: - version: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b - sha1: a400ceb9966cd3bfc87f47f24ed1b9e47d38eab6 - blobstore_id: 19c7a372-4d91-4a9a-af72-96d3fe3eef45 format-version: '2' diff --git a/.final_builds/packages/windows_app_lifecycle/index.yml b/.final_builds/packages/windows_app_lifecycle/index.yml index 1ecff6c23e..3e4c0024c2 100644 --- a/.final_builds/packages/windows_app_lifecycle/index.yml +++ b/.final_builds/packages/windows_app_lifecycle/index.yml @@ -104,8 +104,4 @@ builds: version: cdb1be38851badbbf5df9c4d15c197de2d01b9bf sha1: c9864aa47bd1d6bd9158d046b57b66647f72acdd blobstore_id: aab3af1b-c193-48a7-8a66-bb4ede496224 - b611468c8a02374fd18609608bf8703519a23aa4: - version: b611468c8a02374fd18609608bf8703519a23aa4 - sha1: 09a5fcc7d73a7f8af73715cf634076a1ca4264d2 - blobstore_id: a998de22-6c43-4cf4-b039-4a27e5d6badd format-version: '2' diff --git a/.gitmodules b/.gitmodules index 37d30d2fd5..bdf5081d95 100644 --- a/.gitmodules +++ b/.gitmodules @@ -149,7 +149,7 @@ url = https://github.com/pkg/sftp [submodule "src/github.com/go-sql-driver/mysql"] path = src/github.com/go-sql-driver/mysql - url = https://github.com/cloudfoundry/mysql + url = https://github.com/go-sql-driver/mysql [submodule "src/github.com/lib/pq"] path = src/github.com/lib/pq url = https://github.com/lib/pq diff --git a/docs/metrics.md b/docs/metrics.md index b53b640fd2..8f942930b8 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -100,20 +100,20 @@ ## Route Emitter -| Metric | Description | Unit | -| ------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- | -| `RoutesTotal` | Number of (http and tcp) route associations (`external routes * backend instances`) in the route-emitter's routing table. Emitted periodically every emit cycle. | number | -| `HTTPRouteCount` | Number of (http and tcp) route associations (`external routes * backend instances`) in the route-emitter's routing table. Emitted periodically every emit cycle (only in local mode). | number | -| `TCPRouteCount` | Number of exposable ports (i.e. container ports) in the routing table. Emitted periodically every emit cycle (only in local mode). | number | -| `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 | -| `MessagesEmitted` | Cumulative number of messages the route-emitter sends over NATS to the gorouter. | number | -| `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 | -| `RoutesUnregistered` | Cumulative number of NATs route unregistrations 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 | -| `ConsulDownMode` | Whether the route-emitter is able to connect with the consul correctly | 0 or 1 boolean | -| `LockHeld.` `v1-locks-route_emitter_lock` | Whether a route-emitter holds the route-emitter 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 route-emitter lock. Emitted periodically by the active route-emitter. | ns | +| 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 | +| `LockHeld.` `v1-locks-route_emitter_lock` | Whether a route-emitter holds the route-emitter 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 route-emitter lock. Emitted periodically by the active route-emitter. | ns | +| `MessagesEmitted` | Cumulative number of messages the route-emitter sends over NATS to the gorouter. | number | +| `RouteEmitterSyncDuration` | Time the active route-emitter took to perform its synchronization pass. Emitted periodically. | ns | +| `RoutesRegistered` | Cumulative number of 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 synchronization. | number | +| `RoutesTotal` | Number of routes in the route-emitter's routing table. Emitted periodically. | number | +| `RoutesUnregistered` | Cumulative number of route unregistrations emitted from the route-emitter as it reacts to changes to LRPs. | number | +| `ConsulDownMode` | Whether the route-emitter is able to connect with the consul correctly | 0 or 1 boolean | +| `HTTPRouteCount` | Number of HTTP Routes in the route-emitter's routing table. Emitted periodically and only on local mode. | number | +| `TCPRouteCount` | Number of TCP Routes in the route-emitter's routing table. Emitted periodically and only on local mode and when tcp enabled. | number | ## SSH Proxy diff --git a/examples/aws/README.md b/examples/aws/README.md index 327e09a0de..cc5ff92e8f 100644 --- a/examples/aws/README.md +++ b/examples/aws/README.md @@ -839,57 +839,61 @@ To setup a PostgreSQL instance on RDS in AWS, follow the instructions above desc The CF-MySQL release can be deployed in a few different modes and configurations. All configurations have the same starting steps: -1. Edit or create `$DEPLOYMENT_DIR/stubs/aws-instance-types.yml` to optionally have the following: +1. Make a directory for the CF-MySQL stubs: - ```yaml - instance_types: - mysql_database: m3.medium # replace with the instance type of the mysql database - mysql_proxy: m3.medium # replace with the instance type of the mysql proxy - mysql_persistent_disk_iops: 1000 # Only set this value if the disk_type is io1 - mysql_persistent_disk_type: gp2 # replace with the disk type of the mysql database - ``` + ```bash + mkdir -p $DEPLOYMENT_DIR/stubs/cf-mysql + ``` -1. Clone the [cf-mysql-deployment](https://github.com/cloudfoundry/cf-mysql-deployment) `release-candidate` branch: +1. Clone the CF-MySQL release `release-candidate` branch: - ```bash - cd $HOME/workspace - git clone -b release-candidate https://github.com/cloudfoundry/cf-mysql-deployment - export CF_MYSQL_DEPLOYMENT_DIR=$HOME/workspace/cf-mysql-deployment - ``` + ```bash + git clone -b release-candidate https://github.com/cloudfoundry/cf-mysql-release.git + export CF_MYSQL_RELEASE_DIR=$PWD/cf-mysql-release + ``` -1. Edit the `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml` generated by the `deploy_aws_environment` script to rename the CF-MySQL deployment: +1. Copy over relevant stubs from the CF-MySQL release to deployment directory: + + ```bash + cp $CF_MYSQL_RELEASE_DIR/manifest-generation/examples/standalone/property-overrides.yml \ + $CF_MYSQL_RELEASE_DIR/manifest-generation/examples/standalone/instance-count-overrides.yml \ + $DEPLOYMENT_DIR/stubs/cf-mysql/ + ``` + +1. Copy over CF-based manifest stub: + + ```bash + cp $DEPLOYMENT_DIR/deployments/cf.yml $DEPLOYMENT_DIR/stubs/cf-mysql/cf.yml + ``` + +1. Edit `property-overrides.yml`: + 1. Rename the deployment: ```yaml - - type: replace - path: /name - value: "REPLACE_WITH_CF_MYSQL_DEPLOYMENT_NAME" + property_overrides: + deployment_name: diego-mysql ``` -1. Set the Consul IP addresses and encryption keys in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + 1. Fill in all `REPLACE_WITH_` properties with appropriate values. Ignore all `UNUSED_VALUE` properties. + 1. Set the `host` property to `null`. Do not remove it entirely, since the + current manifest-generation scripts for CF-MySQL depend on its presence: ```yaml - - type: replace - path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/encrypt_keys - value: - REPLACE_WITH_CONSUL_ENCRYPT_KEYS - - type: replace - path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/agent/servers/lan - value: - REPLACE_WITH_CONSUL_SERVER_IPS + property_overrides: + host: null ``` -The Consul IP addresses can be found by running `bosh vms | grep consul` or by inspecting the static IP addresses in the `consul_z1` and `consul_z2` jobs in the CF manifest. + 0. Add the following `seeded_databases` property to configure a database for Diego to use. Replace `REPLACE_ME_WITH_DIEGO_DB_PASSWORD` and `REPLACE_ME_WITH_LOCKET_DB_PASSWORD` with the desired password for each database: -1. Edit the database passwords in `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: ```yaml - - type: replace - path: /properties/cf_mysql/mysql/seeded_databases? - value: + property_overrides: + mysql: + seeded_databases: - name: diego username: diego password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD - name: locket - username: locket + username: diego password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD ``` @@ -901,50 +905,80 @@ After that you can deploy the CF-MySQL release in either mode: * [Highly Available CF-MySQL](#highly-available-cf-mysql) - Recommended for production use. Uses [Consul](https://consul.io) for discovery. -#### Migrating from pervious CF-MySQL deployments +#### Single Node CF-MySQL -If you have used the old style [manifest generation](https://github.com/cloudfoundry/cf-mysql-release/tree/v35.1.0/manifest-generation), then you will have to follow the steps in [cf-mysql-deployment](https://github.com/cloudfoundry/cf-mysql-deployment#upgrading-from-previous-deployment-topologies) to update to the new `cf-mysql-deployment` style. +1. Edits to `instance-count-overrides.yml`: + + ```yaml + instance_count_overrides: + - name: cf-mysql-broker_z1 + instances: 0 + - name: cf-mysql-broker_z2 + instances: 0 + - name: mysql_z2 + instances: 0 + - name: arbitrator_z3 + instances: 0 + - name: proxy_z1 + instances: 0 + - name: proxy_z2 + instances: 0 + ``` -#### Single Node CF-MySQL +1. Generate deployment manifest: -1. Add the following to `$DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml`: + ```bash + $CF_MYSQL_RELEASE_DIR/scripts/generate-deployment-manifest \ + -c $DEPLOYMENT_DIR/stubs/cf-mysql/cf.yml \ + -p $DEPLOYMENT_DIR/stubs/cf-mysql/property-overrides.yml \ + -i $DEPLOYMENT_DIR/stubs/cf-mysql/iaas-settings.yml \ + -n $DEPLOYMENT_DIR/stubs/cf-mysql/instance-count-overrides.yml \ + > $DEPLOYMENT_DIR/deployments/cf-mysql.yml + ``` - ```yaml - - type: replace - path: /instance_groups/name=proxy/instances? - value: 0 - - type: replace - path: /instance_groups/name=arbitrator/instances? - value: 0 - - type: replace - path: /instance_groups/name=mysql/instances? - value: 1 - ``` +1. Deploy the CF-MySQL cluster + + ```bash + cd $CF_MYSQL_RELEASE_DIR + bosh create release && bosh upload release && bosh -d $DEPLOYMENT_DIR/deployments/cf-mysql.yml deploy + ``` #### Highly Available CF-MySQL -No changes are required since the default manifest deploys highly available CF-MySQL +1. Copy additional `job-overrides-consul.yml`: + + ```bash + cp $CF_MYSQL_RELEASE_DIR/manifest-generation/examples/job-overrides-consul.yml \ + $DEPLOYMENT_DIR/stubs/cf-mysql/ + ``` -#### Deploying CF-MySQL +1. Edits to `property-overrides.yml`, add the following properties: -1. Update the cloud config (generated by `deploy_aws_environment`): + ```yaml + property_overrides: + proxy: + # ... + consul_enabled: true + consul_service_name: mysql + ``` + +1. Generate deployment manifest: ```bash - bosh update-cloud-config $DEPLOYMENT_DIR/stubs/cloud-config.yml + $CF_MYSQL_RELEASE_DIR/scripts/generate-deployment-manifest \ + -c $DEPLOYMENT_DIR/stubs/cf-mysql/cf.yml \ + -p $DEPLOYMENT_DIR/stubs/cf-mysql/property-overrides.yml \ + -i $DEPLOYMENT_DIR/stubs/cf-mysql/iaas-settings.yml \ + -j $DEPLOYMENT_DIR/stubs/cf-mysql/job-overrides-consul.yml \ + -n $DEPLOYMENT_DIR/stubs/cf-mysql/instance-count-overrides.yml \ + > $DEPLOYMENT_DIR/deployments/cf-mysql.yml ``` -1. Deploy: +1. Deploy the CF-MySQL cluster - ```bash - bosh -d deploy \ - $CF_MYSQL_DEPLOYMENT_DIR/cf-mysql-deployment.yml \ - --vars-file $DEPLOYMENT_DIR/stubs/cf-mysql/consul-secrets.yml \ - --vars-store $DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml \ - -o $CF_MYSQL_DEPLOYMENT_DIR/operations/proxy-consul.yml \ - -o $DEPLOYMENT_DIR/stubs/cf-mysql/mysql-overrides-ops.yml --no-redact - ``` - -**NOTE**: This command will create the `$DEPLOYMENT_DIR/deployments/cf-mysql-vars.yml` file and store generated credentials in it, so make sure you commit this file. + ```bash + bosh -d $DEPLOYMENT_DIR/deployments/cf-mysql.yml deploy + ``` ### Use the PostgreSQL job from CF-Release diff --git a/examples/aws/deploy_aws_environment b/examples/aws/deploy_aws_environment index 1da6ed3b67..077add7242 100755 --- a/examples/aws/deploy_aws_environment +++ b/examples/aws/deploy_aws_environment @@ -360,7 +360,6 @@ fi mkdir -p stubs/diego mkdir -p stubs/diego-windows -mkdir -p stubs/routing # generate Diego property-override stub with certs if [ -f stubs/diego/property-overrides.yml ]; then @@ -403,21 +402,14 @@ spiff merge \ stubs/aws-resources.yml \ > stubs/routing/iaas-settings.yml -# generate mysql cloud config stub -spiff merge \ - $SCRIPT_DIR/templates/infrastructure/cloud-config.yml \ - $SCRIPT_DIR/templates/infrastructure/cloud-config-internal.yml \ - $aws_instance_types stubs/aws-resources.yml \ - > stubs/cloud-config.yml - mkdir -p stubs/cf-mysql -if [ ! -f stubs/cf-mysql/mysql-overrides-ops.yml ]; then - cp $SCRIPT_DIR/templates/mysql/mysql-overrides-ops.yml stubs/cf-mysql/mysql-overrides-ops.yml -fi - -spiff merge $SCRIPT_DIR/templates/mysql/consul-secrets.yml <(cf_credentials) > stubs/cf-mysql/consul-secrets.yml - +# generate CF-MySQL IaaS-settings stub +spiff merge \ + $SCRIPT_DIR/templates/mysql/iaas-settings.yml \ + $SCRIPT_DIR/templates/mysql/iaas-settings-internal.yml \ + stubs/aws-resources.yml \ + > stubs/cf-mysql/iaas-settings.yml # generate datadog firehose nozzle manifest if the user stubs exist if [ -d stubs/datadog-firehose-nozzle ]; then diff --git a/examples/aws/templates/infrastructure/cloud-config-internal.yml b/examples/aws/templates/infrastructure/cloud-config-internal.yml deleted file mode 100644 index 70448843b1..0000000000 --- a/examples/aws/templates/infrastructure/cloud-config-internal.yml +++ /dev/null @@ -1,100 +0,0 @@ -instance_types: (( merge )) - -azs: -- name: z1 - cloud_properties: - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) -- name: z2 - cloud_properties: - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) -- name: z3 - cloud_properties: - availability_zone: us-east-1a - availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ3 )) - -vm_types: -- name: database - cloud_properties: - instance_type: (( instance_types.mysql_database || "m3.medium" )) -- name: proxy - cloud_properties: - instance_type: (( instance_types.mysql_proxy || "m3.medium" )) -- name: arbitrator - cloud_properties: - instance_type: t2.micro -- name: errand - cloud_properties: - instance_type: m3.medium -- name: compilation - cloud_properties: - instance_type: c4.large - ephemeral_disk: - size: 30000 - type: gp2 -disk_types: -- cloud_properties: - iops: (( instance_types.mysql_persistent_disk_iops || nil )) - type: (( instance_types.mysql_persistent_disk_type || "gp2" )) - disk_size: 100000 - name: mysql-persistent-disk - -compilation: - workers: 4 - network: default - az: z1 - reuse_compilation_vms: true - vm_type: compilation - -networks: -- name: default - subnets: - - az: z1 - range: (( Resources.SubnetCIDR.MySQLZ1 )) - reserved: - - (( Resources.SubnetOctets.MySQLZ1.[2] ".2 - " Resources.SubnetOctets.MySQLZ1.[2] ".9" )) - - (( Resources.SubnetOctets.MySQLZ1.[2] ".130 - " Resources.SubnetOctets.MySQLZ1.[2] ".254" )) - static: (( [Resources.SubnetOctets.MySQLZ1.[2] ".10 - " Resources.SubnetOctets.MySQLZ1.[2] ".63"] )) - gateway: (( Resources.SubnetOctets.MySQLZ1.[2] ".1" )) - dns: (( [Resources.SubnetOctets.MySQLZ1.[1] ".0.2"] )) - cloud_properties: - subnet: (( Resources.Subnet.MySQLZ1 )) - - az: z2 - range: (( Resources.SubnetCIDR.MySQLZ2 )) - reserved: - - (( Resources.SubnetOctets.MySQLZ2.[2] ".2 - " Resources.SubnetOctets.MySQLZ2.[2] ".9" )) - - (( Resources.SubnetOctets.MySQLZ2.[2] ".130 - " Resources.SubnetOctets.MySQLZ2.[2] ".254" )) - static: (( [Resources.SubnetOctets.MySQLZ2.[2] ".10 - " Resources.SubnetOctets.MySQLZ2.[2] ".63"] )) - gateway: (( Resources.SubnetOctets.MySQLZ2.[2] ".1" )) - dns: (( [Resources.SubnetOctets.MySQLZ2.[1] ".0.2"] )) - cloud_properties: - subnet: (( Resources.Subnet.MySQLZ2 )) - - az: z3 - range: (( Resources.SubnetCIDR.MySQLZ3 )) - reserved: - - (( Resources.SubnetOctets.MySQLZ3.[2] ".2 - " Resources.SubnetOctets.MySQLZ3.[2] ".9" )) - - (( Resources.SubnetOctets.MySQLZ3.[2] ".130 - " Resources.SubnetOctets.MySQLZ3.[2] ".254" )) - static: (( [Resources.SubnetOctets.MySQLZ3.[2] ".10 - " Resources.SubnetOctets.MySQLZ3.[2] ".63"] )) - gateway: (( Resources.SubnetOctets.MySQLZ3.[2] ".1" )) - dns: (( [Resources.SubnetOctets.MySQLZ3.[1] ".0.2"] )) - cloud_properties: - subnet: (( Resources.Subnet.MySQLZ3 )) - -#################################################### - -Resources: - Subnet: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SubnetAvailabilityZone: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SubnetOctets: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) - SubnetCIDR: - MySQLZ1: (( merge )) - MySQLZ2: (( merge )) - MySQLZ3: (( merge )) diff --git a/examples/aws/templates/infrastructure/cloud-config.yml b/examples/aws/templates/infrastructure/cloud-config.yml deleted file mode 100644 index 56f6738068..0000000000 --- a/examples/aws/templates/infrastructure/cloud-config.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -azs: (( merge )) -disk_types: (( merge )) -vm_types: (( merge )) -compilation: (( merge )) -networks: (( merge )) -networks: (( merge )) diff --git a/examples/aws/templates/mysql/consul-secrets.yml b/examples/aws/templates/mysql/consul-secrets.yml deleted file mode 100644 index f934512e4f..0000000000 --- a/examples/aws/templates/mysql/consul-secrets.yml +++ /dev/null @@ -1,6 +0,0 @@ -cf_credentials: ((merge)) -consul_agent_cert: ((cf_credentials.consul.agent_cert)) -consul_agent_key: ((cf_credentials.consul.agent_key)) -consul_server_cert: ((cf_credentials.consul.server_cert)) -consul_server_key: ((cf_credentials.consul.server_key)) -consul_ca_cert: ((cf_credentials.consul.ca_cert)) diff --git a/examples/aws/templates/mysql/iaas-settings-internal.yml b/examples/aws/templates/mysql/iaas-settings-internal.yml new file mode 100644 index 0000000000..f297440e5a --- /dev/null +++ b/examples/aws/templates/mysql/iaas-settings-internal.yml @@ -0,0 +1,117 @@ +iaas_settings: + stemcell: + name: bosh-aws-xen-hvm-ubuntu-trusty-go_agent + version: latest + subnet_configs: + - name: mysql1 + subnets: + - range: (( Resources.SubnetCIDR.MySQLZ1 )) + reserved: + - (( Resources.SubnetOctets.MySQLZ1.[2] ".2 - " Resources.SubnetOctets.MySQLZ1.[2] ".9" )) + - (( Resources.SubnetOctets.MySQLZ1.[2] ".130 - " Resources.SubnetOctets.MySQLZ1.[2] ".254" )) + static: (( [Resources.SubnetOctets.MySQLZ1.[2] ".10 - " Resources.SubnetOctets.MySQLZ1.[2] ".63"] )) + gateway: (( Resources.SubnetOctets.MySQLZ1.[2] ".1" )) + dns: (( [Resources.SubnetOctets.MySQLZ1.[1] ".0.2"] )) + cloud_properties: + subnet: (( Resources.Subnet.MySQLZ1 )) + - name: mysql2 + subnets: + - range: (( Resources.SubnetCIDR.MySQLZ2 )) + reserved: + - (( Resources.SubnetOctets.MySQLZ2.[2] ".2 - " Resources.SubnetOctets.MySQLZ2.[2] ".9" )) + - (( Resources.SubnetOctets.MySQLZ2.[2] ".130 - " Resources.SubnetOctets.MySQLZ2.[2] ".254" )) + static: (( [Resources.SubnetOctets.MySQLZ2.[2] ".10 - " Resources.SubnetOctets.MySQLZ2.[2] ".63"] )) + gateway: (( Resources.SubnetOctets.MySQLZ2.[2] ".1" )) + dns: (( [Resources.SubnetOctets.MySQLZ2.[1] ".0.2"] )) + cloud_properties: + subnet: (( Resources.Subnet.MySQLZ2 )) + - name: mysql3 + subnets: + - range: (( Resources.SubnetCIDR.MySQLZ3 )) + reserved: + - (( Resources.SubnetOctets.MySQLZ3.[2] ".2 - " Resources.SubnetOctets.MySQLZ3.[2] ".9" )) + - (( Resources.SubnetOctets.MySQLZ3.[2] ".130 - " Resources.SubnetOctets.MySQLZ3.[2] ".254" )) + static: (( [Resources.SubnetOctets.MySQLZ3.[2] ".10 - " Resources.SubnetOctets.MySQLZ3.[2] ".63"] )) + gateway: (( Resources.SubnetOctets.MySQLZ3.[2] ".1" )) + dns: (( [Resources.SubnetOctets.MySQLZ3.[1] ".0.2"] )) + cloud_properties: + subnet: (( Resources.Subnet.MySQLZ3 )) + compilation_cloud_properties: + instance_type: c4.large + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) + ephemeral_disk: + size: 30000 # in MB + type: gp2 + resource_pool_cloud_properties: + - name: mysql_z1 + cloud_properties: + instance_type: m3.large + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) + + - name: mysql_z2 + cloud_properties: + instance_type: m3.large + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) + + - name: mysql_z3 + cloud_properties: + instance_type: m3.large + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ3 )) + + - name: arbitrator_z3 + cloud_properties: + instance_type: t2.small + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ3 )) + + - name: proxy_z1 + cloud_properties: + instance_type: m3.medium + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) + + - name: proxy_z2 + cloud_properties: + instance_type: m3.medium + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) + + - name: cf-mysql-broker_z1 + cloud_properties: + instance_type: m3.medium + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) + + - name: cf-mysql-broker_z2 + cloud_properties: + instance_type: m3.medium + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ2 )) + + - name: errands_z1 + cloud_properties: + instance_type: m3.medium + availability_zone: (( Resources.SubnetAvailabilityZone.MySQLZ1 )) + + disk_pools: + - name: mysql-persistent-disk + disk_size: 100000 + cloud_properties: + type: gp2 + +Resources: + Subnet: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SubnetAvailabilityZone: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SubnetOctets: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SubnetCIDR: + MySQLZ1: (( merge )) + MySQLZ2: (( merge )) + MySQLZ3: (( merge )) + SecurityGroupName: + Internal: (( merge )) + LoadBalancer: + SSHProxyELB: (( merge )) diff --git a/examples/aws/templates/mysql/iaas-settings.yml b/examples/aws/templates/mysql/iaas-settings.yml new file mode 100644 index 0000000000..850f208d7f --- /dev/null +++ b/examples/aws/templates/mysql/iaas-settings.yml @@ -0,0 +1 @@ +iaas_settings: (( merge )) diff --git a/examples/aws/templates/mysql/mysql-overrides-ops.yml b/examples/aws/templates/mysql/mysql-overrides-ops.yml deleted file mode 100644 index 37ae65afdb..0000000000 --- a/examples/aws/templates/mysql/mysql-overrides-ops.yml +++ /dev/null @@ -1,73 +0,0 @@ -- type: replace - path: /name - value: "REPLACE_WITH_CF_MYSQL_DEPLOYMENT_NAME" -- type: replace - path: /properties/cf_mysql/mysql/innodb_flush_log_at_trx_commit? - value: 0 -- type: replace - path: /properties/cf_mysql/mysql/binlog_enabled? - value: false -- type: replace - path: /properties/cf_mysql/mysql/binlog_expire_days? - value: 5 -- type: replace - path: /properties/cf_mysql/mysql/innodb_buffer_pool_size? - value: 12_000_000_000 # set the innodb buffer pool size to 12GB ~80% of memory -- type: replace - path: /properties/cf_mysql/mysql/innodb_buffer_pool_instances? - value: 16 -- type: replace - path: /instance_groups/name=mysql/vm_type? - value: database -- type: replace - path: /instance_groups/name=mysql/persistent_disk_type? - value: mysql-persistent-disk -- type: remove - path: /instance_groups/name=mysql/persistent_disk? -- type: replace - path: /instance_groups/name=proxy/vm_type? - value: proxy -- type: replace - path: /instance_groups/name=arbitrator/vm_type? - value: arbitrator -- type: replace - path: /instance_groups/name=rejoin-unsafe/vm_type? - value: errand -- type: replace - path: /instance_groups/name=rejoin-unsafe/instances? - value: 0 -- type: replace - path: /instance_groups/name=verify-cluster-schemas/vm_type? - value: errand -- type: replace - path: /instance_groups/name=verify-cluster-schemas/instances? - value: 0 -- type: replace - path: /instance_groups/name=smoke-tests/vm_type? - value: errand -- type: replace - path: /instance_groups/name=smoke-tests/instances? - value: 0 -- type: replace - path: /instance_groups/name=bootstrap/vm_type? - value: errand -- type: replace - path: /stemcells/alias=default/version - value: latest -- type: replace - path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/encrypt_keys - value: - REPLACE_WITH_CONSUL_ENCRYPT_KEYS -- type: replace - path: /instance_groups/name=proxy/jobs/name=consul_agent/properties?/consul/agent/servers/lan - value: - REPLACE_WITH_CONSUL_SERVER_IPS -- type: replace - path: /properties/cf_mysql/mysql/seeded_databases? - value: - - name: diego - username: diego - password: REPLACE_ME_WITH_DIEGO_DB_PASSWORD - - name: locket - username: locket - password: REPLACE_ME_WITH_LOCKET_DB_PASSWORD diff --git a/jobs/auctioneer/spec b/jobs/auctioneer/spec index 18ce7605de..da88bae1a4 100644 --- a/jobs/auctioneer/spec +++ b/jobs/auctioneer/spec @@ -15,9 +15,6 @@ templates: rep_ca.crt.erb: config/certs/rep/ca.crt rep_client.crt.erb: config/certs/rep/client.crt rep_client.key.erb: config/certs/rep/client.key - loggregator_ca.crt.erb: config/certs/loggregator/ca.crt - loggregator_client.crt.erb: config/certs/loggregator/client.crt - loggregator_client.key.erb: config/certs/loggregator/client.key packages: - pid_utils @@ -91,16 +88,3 @@ properties: diego.auctioneer.skip_consul_lock: default: false description: "EXPERIMENTAL: true to skip consul lock. locket.api_location must be set" - - loggregator.use_v2_api: - description: "True to use local metron agent gRPC v2 api. False, to use UDP v1 api" - default: false - loggregator.v2_api_port: - description: "Local metron agent gRPC port" - default: 3458 - loggregator.ca_cert: - description: "CA Cert used to communicate with local metron agent over gRPC" - loggregator.cert: - description: "Cert used to communicate with local metron agent over gRPC" - loggregator.key: - description: "Key used to communicate with local metron agent over gRPC" diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb index 8067ba9773..fc8c54222d 100644 --- a/jobs/auctioneer/templates/auctioneer.json.erb +++ b/jobs/auctioneer/templates/auctioneer.json.erb @@ -1,5 +1,5 @@ <%= - conf_dir = "/var/vcap/jobs/auctioneer/config" + CONF_DIR = "/var/vcap/jobs/auctioneer/config" config = { require_tls: p("diego.auctioneer.require_tls"), @@ -16,9 +16,9 @@ } if p("diego.auctioneer.bbs.require_ssl") - config[:bbs_ca_cert_file] = "#{conf_dir}/certs/bbs/ca.crt" - config[:bbs_client_cert_file] = "#{conf_dir}/certs/bbs/client.crt" - config[:bbs_client_key_file] = "#{conf_dir}/certs/bbs/client.key" + config[:bbs_ca_cert_file] = "#{CONF_DIR}/certs/bbs/ca.crt" + config[:bbs_client_cert_file] = "#{CONF_DIR}/certs/bbs/client.crt" + config[:bbs_client_key_file] = "#{CONF_DIR}/certs/bbs/client.key" config[:bbs_address] = "https://#{p("diego.auctioneer.bbs.api_location")}" else config[:bbs_address] = "http://#{p("diego.auctioneer.bbs.api_location")}" @@ -33,42 +33,27 @@ end if_p("diego.auctioneer.rep.ca_cert", "diego.auctioneer.rep.client_key", "diego.auctioneer.rep.client_cert") do - config[:rep_client_cert] = "#{conf_dir}/certs/rep/client.crt" - config[:rep_client_key] = "#{conf_dir}/certs/rep/client.key" - config[:rep_ca_cert] = "#{conf_dir}/certs/rep/ca.crt" + config[:rep_client_cert] = "#{CONF_DIR}/certs/rep/client.crt" + config[:rep_client_key] = "#{CONF_DIR}/certs/rep/client.key" + config[:rep_ca_cert] = "#{CONF_DIR}/certs/rep/ca.crt" end if p("diego.auctioneer.require_tls") - config[:ca_cert_file] = "#{conf_dir}/certs/auctioneer/ca.crt" - config[:server_cert_file] = "#{conf_dir}/certs/auctioneer/server.crt" - config[:server_key_file] = "#{conf_dir}/certs/auctioneer/server.key" + config[:ca_cert_file] = "#{CONF_DIR}/certs/auctioneer/ca.crt" + config[:server_cert_file] = "#{CONF_DIR}/certs/auctioneer/server.crt" + config[:server_key_file] = "#{CONF_DIR}/certs/auctioneer/server.key" end if_p("diego.auctioneer.locket.api_location") do |value| config[:locket_address] = value - config[:uuid] = spec.id - config[:locket_ca_cert_file] = "#{conf_dir}/certs/bbs/ca.crt" - config[:locket_client_cert_file] = "#{conf_dir}/certs/bbs/client.crt" - config[:locket_client_key_file] = "#{conf_dir}/certs/bbs/client.key" + config[:locket_ca_cert_file] = "#{CONF_DIR}/certs/bbs/ca.crt" + config[:locket_client_cert_file] = "#{CONF_DIR}/certs/bbs/client.crt" + 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 - config[:loggregator]={} - config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api") - if p("loggregator.use_v2_api") == true - config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port") - config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt" - config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt" - config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key" - config[:loggregator][:loggregator_job_deployment] = spec.deployment - config[:loggregator][:loggregator_job_name] = spec.name - config[:loggregator][:loggregator_job_index] = spec.id - config[:loggregator][:loggregator_job_ip] = spec.address - config[:loggregator][:loggregator_job_origin] = "auctioneer" - end - config.to_json %> diff --git a/jobs/auctioneer/templates/loggregator_ca.crt.erb b/jobs/auctioneer/templates/loggregator_ca.crt.erb deleted file mode 100644 index 150228f869..0000000000 --- a/jobs/auctioneer/templates/loggregator_ca.crt.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if_p("loggregator.ca_cert") do |value| %> -<%= value %> -<% end %> - diff --git a/jobs/auctioneer/templates/loggregator_client.crt.erb b/jobs/auctioneer/templates/loggregator_client.crt.erb deleted file mode 100644 index 725c7bc0de..0000000000 --- a/jobs/auctioneer/templates/loggregator_client.crt.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% if_p("loggregator.cert") do |value| %> -<%= value %> -<% end %> diff --git a/jobs/auctioneer/templates/loggregator_client.key.erb b/jobs/auctioneer/templates/loggregator_client.key.erb deleted file mode 100644 index c71c6d51f2..0000000000 --- a/jobs/auctioneer/templates/loggregator_client.key.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if_p("loggregator.key") do |value| %> -<%= value %> -<% end %> - diff --git a/jobs/bbs/spec b/jobs/bbs/spec index 38411eee6e..a7b173a09e 100644 --- a/jobs/bbs/spec +++ b/jobs/bbs/spec @@ -20,9 +20,6 @@ templates: auctioneer_ca.crt.erb: config/certs/auctioneer/ca.crt auctioneer_client.crt.erb: config/certs/auctioneer/client.crt auctioneer_client.key.erb: config/certs/auctioneer/client.key - loggregator_ca.crt.erb: config/certs/loggregator/ca.crt - loggregator_client.crt.erb: config/certs/loggregator/client.crt - loggregator_client.key.erb: config/certs/loggregator/client.key packages: - pid_utils @@ -162,16 +159,3 @@ properties: diego.bbs.skip_consul_lock: default: false description: "EXPERIMENTAL: true to skip consul lock. locket.api_location must be set" - - loggregator.use_v2_api: - description: "True to use local metron agent gRPC v2 api. False, to use UDP v1 api" - default: false - loggregator.v2_api_port: - description: "Local metron agent gRPC port" - default: 3458 - loggregator.ca_cert: - description: "CA Cert used to communicate with local metron agent over gRPC" - loggregator.cert: - description: "Cert used to communicate with local metron agent over gRPC" - loggregator.key: - description: "Key used to communicate with local metron agent over gRPC" diff --git a/jobs/bbs/templates/bbs.json.erb b/jobs/bbs/templates/bbs.json.erb index d5b78f5b9f..515df48b4a 100644 --- a/jobs/bbs/templates/bbs.json.erb +++ b/jobs/bbs/templates/bbs.json.erb @@ -174,7 +174,6 @@ if_p("diego.bbs.locket.api_location") do |value| config[:locket_address] = value - config[:uuid] = spec.id config[:locket_ca_cert_file] = "#{CONF_DIR}/certs/ca.crt" config[:locket_client_cert_file] = "#{CONF_DIR}/certs/server.crt" config[:locket_client_key_file] = "#{CONF_DIR}/certs/server.key" @@ -184,19 +183,5 @@ config[:skip_consul_lock] = skip_consul_lock end - config[:loggregator]={} - config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api") - if p("loggregator.use_v2_api") == true - config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port") - config[:loggregator][:loggregator_ca_path] = "#{CONF_DIR}/certs/loggregator/ca.crt" - config[:loggregator][:loggregator_cert_path] = "#{CONF_DIR}/certs/loggregator/client.crt" - config[:loggregator][:loggregator_key_path] = "#{CONF_DIR}/certs/loggregator/client.key" - config[:loggregator][:loggregator_job_deployment] = spec.deployment - config[:loggregator][:loggregator_job_name] = spec.name - config[:loggregator][:loggregator_job_index] = spec.id - config[:loggregator][:loggregator_job_ip] = spec.address - config[:loggregator][:loggregator_job_origin] = "bbs" - end - config.to_json %> diff --git a/jobs/bbs/templates/loggregator_ca.crt.erb b/jobs/bbs/templates/loggregator_ca.crt.erb deleted file mode 100644 index 150228f869..0000000000 --- a/jobs/bbs/templates/loggregator_ca.crt.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if_p("loggregator.ca_cert") do |value| %> -<%= value %> -<% end %> - diff --git a/jobs/bbs/templates/loggregator_client.crt.erb b/jobs/bbs/templates/loggregator_client.crt.erb deleted file mode 100644 index 725c7bc0de..0000000000 --- a/jobs/bbs/templates/loggregator_client.crt.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% if_p("loggregator.cert") do |value| %> -<%= value %> -<% end %> diff --git a/jobs/bbs/templates/loggregator_client.key.erb b/jobs/bbs/templates/loggregator_client.key.erb deleted file mode 100644 index c71c6d51f2..0000000000 --- a/jobs/bbs/templates/loggregator_client.key.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% if_p("loggregator.key") do |value| %> -<%= value %> -<% end %> - diff --git a/manifest-generation/diego-windows.yml b/manifest-generation/diego-windows.yml index 4a06d9aa52..cfc6ba6ef3 100644 --- a/manifest-generation/diego-windows.yml +++ b/manifest-generation/diego-windows.yml @@ -205,8 +205,7 @@ properties: client_key: (( property_overrides.rep.consul.client_key || nil )) locket: api_location: (( sql_lock_overrides.locket.api_location )) - executor: - max_cache_size_in_bytes: (( property_overrides.executor.max_cache_size_in_bytes || nil )) + route_emitter: dropsonde_port: (( config_from_cf.metron_agent.dropsonde_incoming_port )) bbs: diff --git a/packages/auctioneer/spec b/packages/auctioneer/spec index ad0b5ace34..4830d783a4 100644 --- a/packages/auctioneer/spec +++ b/packages/auctioneer/spec @@ -26,30 +26,6 @@ files: - code.cloudfoundry.org/debugserver/*.go # gosub - code.cloudfoundry.org/durationjson/*.go # gosub - code.cloudfoundry.org/executor/*.go # gosub - - code.cloudfoundry.org/go-loggregator/*.go # gosub - - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub - - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub - - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub - code.cloudfoundry.org/lager/*.go # gosub - code.cloudfoundry.org/lager/lagerflags/*.go # gosub - code.cloudfoundry.org/localip/*.go # gosub diff --git a/packages/bbs/spec b/packages/bbs/spec index 97e83e00b2..7d9d84fb80 100644 --- a/packages/bbs/spec +++ b/packages/bbs/spec @@ -36,30 +36,6 @@ files: - code.cloudfoundry.org/debugserver/*.go # gosub - code.cloudfoundry.org/durationjson/*.go # gosub - code.cloudfoundry.org/executor/*.go # gosub - - code.cloudfoundry.org/go-loggregator/*.go # gosub - - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub - - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub - - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub - code.cloudfoundry.org/lager/*.go # gosub - code.cloudfoundry.org/lager/lagerflags/*.go # gosub - code.cloudfoundry.org/locket/*.go # gosub diff --git a/packages/benchmark-bbs/spec b/packages/benchmark-bbs/spec index cce7872649..eebf6e4a2b 100644 --- a/packages/benchmark-bbs/spec +++ b/packages/benchmark-bbs/spec @@ -28,30 +28,6 @@ files: - code.cloudfoundry.org/debugserver/*.go # gosub - code.cloudfoundry.org/durationjson/*.go # gosub - code.cloudfoundry.org/executor/*.go # gosub - - code.cloudfoundry.org/go-loggregator/*.go # gosub - - code.cloudfoundry.org/go-loggregator/compatibility/*.go # gosub - - code.cloudfoundry.org/go-loggregator/internal/v2shim/*.go # gosub - - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - - code.cloudfoundry.org/go-loggregator/testhelpers/fakes/v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub - code.cloudfoundry.org/lager/*.go # gosub - code.cloudfoundry.org/lager/lagerflags/*.go # gosub - code.cloudfoundry.org/locket/*.go # gosub @@ -83,21 +59,8 @@ files: - github.com/aws/aws-sdk-go/service/s3/s3iface/*.go # gosub - github.com/aws/aws-sdk-go/service/s3/s3manager/*.go # gosub - github.com/bmizerany/pat/*.go # gosub - - github.com/cloudfoundry/dropsonde/*.go # gosub - - github.com/cloudfoundry/dropsonde/emitter/*.go # gosub - - github.com/cloudfoundry/dropsonde/envelope_sender/*.go # gosub - - github.com/cloudfoundry/dropsonde/envelopes/*.go # gosub - - github.com/cloudfoundry/dropsonde/factories/*.go # gosub - - github.com/cloudfoundry/dropsonde/instrumented_handler/*.go # gosub - - github.com/cloudfoundry/dropsonde/instrumented_round_tripper/*.go # gosub - - github.com/cloudfoundry/dropsonde/log_sender/*.go # gosub - - github.com/cloudfoundry/dropsonde/logs/*.go # gosub - github.com/cloudfoundry/dropsonde/metric_sender/*.go # gosub - - github.com/cloudfoundry/dropsonde/metricbatcher/*.go # gosub - github.com/cloudfoundry/dropsonde/metrics/*.go # gosub - - github.com/cloudfoundry/dropsonde/runtime_stats/*.go # gosub - - github.com/cloudfoundry/gosteno/*.go # gosub - - github.com/cloudfoundry/gosteno/syslog/*.go # gosub - github.com/cloudfoundry/sonde-go/events/*.go # gosub - github.com/coreos/go-etcd/etcd/*.go # gosub - github.com/go-sql-driver/mysql/*.go # gosub diff --git a/packages/healthcheck/packaging b/packages/healthcheck/packaging index 8a725d2451..7a6a9c39bc 100644 --- a/packages/healthcheck/packaging +++ b/packages/healthcheck/packaging @@ -9,7 +9,6 @@ export PATH=$GOROOT/bin:$PATH CGO_ENABLED=0 go build -a -installsuffix static code.cloudfoundry.org/healthcheck/cmd/healthcheck GOOS=windows CGO_ENABLED=0 go build -a -installsuffix static code.cloudfoundry.org/healthcheck/cmd/healthcheck -GOOS=windows CGO_ENABLED=0 go build -o healthcheck-external-port.exe -tags=external -a -installsuffix static code.cloudfoundry.org/healthcheck/cmd/healthcheck for binary in healthcheck; do ldd $binary && echo "$binary must be statically linked" && false @@ -17,7 +16,6 @@ done cp healthcheck ${BOSH_INSTALL_TARGET} cp healthcheck.exe ${BOSH_INSTALL_TARGET} -cp healthcheck-external-port.exe ${BOSH_INSTALL_TARGET} # clean up source artifacts rm -rf ${BOSH_INSTALL_TARGET}/src ${BOSH_INSTALL_TARGET}/pkg diff --git a/packages/rep/spec b/packages/rep/spec index 7708a5e172..7eddb37736 100644 --- a/packages/rep/spec +++ b/packages/rep/spec @@ -51,9 +51,6 @@ files: - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub @@ -119,6 +116,7 @@ files: - github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub - github.com/gogo/protobuf/sortkeys/*.go # gosub - github.com/golang/protobuf/proto/*.go # gosub + - github.com/golang/protobuf/ptypes/any/*.go # gosub - github.com/google/shlex/*.go # gosub - github.com/hashicorp/consul/api/*.go # gosub - github.com/hashicorp/consul/vendor/github.com/hashicorp/go-cleanhttp/*.go # gosub diff --git a/packages/rep_windows/spec b/packages/rep_windows/spec index 1d8418b210..1e762d900a 100644 --- a/packages/rep_windows/spec +++ b/packages/rep_windows/spec @@ -52,9 +52,6 @@ files: - code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub - code.cloudfoundry.org/go-loggregator/runtimeemitter/*.go # gosub - code.cloudfoundry.org/go-loggregator/v1/*.go # gosub - - code.cloudfoundry.org/go-loggregator/v1/conversion/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/proto/*.go # gosub - - code.cloudfoundry.org/go-loggregator/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub - code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub @@ -120,6 +117,7 @@ files: - github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub - github.com/gogo/protobuf/sortkeys/*.go # gosub - github.com/golang/protobuf/proto/*.go # gosub + - github.com/golang/protobuf/ptypes/any/*.go # gosub - github.com/google/shlex/*.go # gosub - github.com/hashicorp/consul/api/*.go # gosub - github.com/hashicorp/consul/vendor/github.com/hashicorp/go-cleanhttp/*.go # gosub diff --git a/packages/windows_app_lifecycle/packaging b/packages/windows_app_lifecycle/packaging index a060979d7a..081818b652 100644 --- a/packages/windows_app_lifecycle/packaging +++ b/packages/windows_app_lifecycle/packaging @@ -3,5 +3,5 @@ set -e mkdir -p tmp tar -xzf lifecycles/windows_app_lifecycle-*.tgz -C tmp tar -xzf /var/vcap/packages/diego-sshd/diego-sshd-windows.tgz -C tmp -cp /var/vcap/packages/healthcheck/healthcheck-external-port.exe tmp/healthcheck.exe +cp /var/vcap/packages/healthcheck/healthcheck.exe tmp tar -zcf ${BOSH_INSTALL_TARGET}/windows_app_lifecycle.tgz -C tmp . diff --git a/releases/diego-1.22.0.yml b/releases/diego-1.22.0.yml deleted file mode 100644 index a7f9886df2..0000000000 --- a/releases/diego-1.22.0.yml +++ /dev/null @@ -1,187 +0,0 @@ ---- -packages: -- name: auctioneer - version: 20545141cea1e9edbcf2886587a373df85ac896f - fingerprint: 20545141cea1e9edbcf2886587a373df85ac896f - sha1: 957ab48788b0ef3c5237d3b76b95e84b4104d512 - dependencies: - - golang -- name: bbs - version: ec864334278588163141f484a045c88802e04724 - fingerprint: ec864334278588163141f484a045c88802e04724 - sha1: cf71eafe7a5d0c4a4fdb390488c135487a0d35c1 - dependencies: - - golang -- name: benchmark-bbs - version: cc173e1d081296ba1aa2c2e63f8788032868d48d - fingerprint: cc173e1d081296ba1aa2c2e63f8788032868d48d - sha1: 34feb0092672d7bc4b233eaa99cf4dce06b7bd12 - dependencies: - - golang -- name: buildpack_app_lifecycle - version: 5689eeb118926f586e15bffd8b58bb1b3c0f223c - fingerprint: 5689eeb118926f586e15bffd8b58bb1b3c0f223c - sha1: 3d847899504df650ca4df6b6202a336b7c4a04ea - dependencies: - - diego-sshd - - golang - - healthcheck -- name: cfdot - version: dcfa79035c570c22eb57c27f79bf711688345e3a - fingerprint: dcfa79035c570c22eb57c27f79bf711688345e3a - sha1: 5a61cc1d943c8493108db04f259807532e2cd021 - dependencies: - - golang -- name: diego-sshd - version: e926fd1bd1da3bab5c78e530cfe68932c5831674 - fingerprint: e926fd1bd1da3bab5c78e530cfe68932c5831674 - sha1: b60e89c00a548834e9b8e9104541c191e8fc11c9 - dependencies: - - golang -- name: docker_app_lifecycle - version: f87324f504027becdb6f931da090264713ad0086 - fingerprint: f87324f504027becdb6f931da090264713ad0086 - sha1: 25bbc31eec8699c81e97dea749fd5b0ae29b68be - dependencies: - - diego-sshd - - golang - - healthcheck -- name: file_server - version: acc0f630405c5bc158cb2e15895f2e11a6cd03ee - fingerprint: acc0f630405c5bc158cb2e15895f2e11a6cd03ee - sha1: 9f5dcf24bca69106015371f05a0f6fb1b1789fca - dependencies: - - golang -- name: golang-windows - version: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 - fingerprint: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 - sha1: bd627bc213dd1d2c207ce469540c8c915139fcc0 - dependencies: [] -- name: golang - version: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 - fingerprint: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 - sha1: 958c65e49f9457ecc08f028a1aea3c94651eada6 - dependencies: [] -- name: healthcheck - version: 9cf72206a74667125ff277cc24635868e2dc2339 - fingerprint: 9cf72206a74667125ff277cc24635868e2dc2339 - sha1: e7cd74b0e081e771df08935ef06f2488e40b34e3 - dependencies: - - golang -- name: healthcheck_windows - version: b01597a98498c20b30f81668369bfc60c1f5fc74 - fingerprint: b01597a98498c20b30f81668369bfc60c1f5fc74 - sha1: ed4bc37bbd4bb169ac75a3717eeeb4e18145698d - dependencies: - - golang-windows -- name: locket - version: f0327c8530f8dcf96930d35c0456149aa5ed63fe - fingerprint: f0327c8530f8dcf96930d35c0456149aa5ed63fe - sha1: 24c0613a407b56a1d11d264b3dbd45a603258e8e - dependencies: - - golang -- name: pid_utils - version: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 - fingerprint: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 - sha1: 6ada005648f7f631cd9fef1685574e27be88c913 - dependencies: [] -- name: rep - version: 48951016812411b17b1c62aa13ea1bf0f3f5479c - fingerprint: 48951016812411b17b1c62aa13ea1bf0f3f5479c - sha1: 802f42740b63c239120ea2452ae51b78241c35d5 - dependencies: - - golang -- name: rep_windows - version: 6e25144f764c7b4167a469234e50582847a28822 - fingerprint: 6e25144f764c7b4167a469234e50582847a28822 - sha1: 50caedd5a1343bce0013ec357ee998d9dfcf2184 - dependencies: - - golang-windows -- name: route_emitter - version: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e - fingerprint: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e - sha1: 7abadbc1eb972b2a0738b77d2ded0ea979c07494 - dependencies: - - golang -- name: route_emitter_windows - version: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 - fingerprint: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 - sha1: c0cc10917c7c2900f8ebe7e663810d280a8d333a - dependencies: - - golang-windows -- name: ssh_proxy - version: 3d37c0edadad1418071ba2d59231ab424fac6833 - fingerprint: 3d37c0edadad1418071ba2d59231ab424fac6833 - sha1: 0561aa0de62fb3b8ed8b63ad2514667756ea1848 - dependencies: - - golang -- name: vizzini - version: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b - fingerprint: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b - sha1: a400ceb9966cd3bfc87f47f24ed1b9e47d38eab6 - dependencies: - - golang -- name: windows_app_lifecycle - version: b611468c8a02374fd18609608bf8703519a23aa4 - fingerprint: b611468c8a02374fd18609608bf8703519a23aa4 - sha1: 09a5fcc7d73a7f8af73715cf634076a1ca4264d2 - dependencies: - - diego-sshd - - healthcheck -jobs: -- name: auctioneer - version: bd357fda056ec0f2edf29f0c9183dde36af99a93 - fingerprint: bd357fda056ec0f2edf29f0c9183dde36af99a93 - sha1: affecabafe4f1273c34a6d9a6d70353a08158969 -- name: bbs - version: cafe0e5eff944f26b960006a835356304e02f9e2 - fingerprint: cafe0e5eff944f26b960006a835356304e02f9e2 - sha1: bfdfdc67aa0266ba90ba95c4e3462d3d0b85cea0 -- name: benchmark-bbs - version: e023423f093d3ce5be53bbce30b4823852506078 - fingerprint: e023423f093d3ce5be53bbce30b4823852506078 - sha1: 8748824ae24919bed064ee1cda208b993b52a6fb -- name: cfdot - version: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 - fingerprint: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 - sha1: ec3a4f1ef05c1638d4e4f12fe630a34d27e9fc4d -- name: file_server - version: de829eb0408806028a4010c6018f3e87b5190c05 - fingerprint: de829eb0408806028a4010c6018f3e87b5190c05 - sha1: 30bcef30b16d1445dc7e6b92dc4c7a015f5975e5 -- name: locket - version: f4f379943bab0f5fa0a9727d82b91760eb52a81e - fingerprint: f4f379943bab0f5fa0a9727d82b91760eb52a81e - sha1: 8b964808937f54c50c684506d7d89d84e5270b2c -- name: rep - version: 40bec4155435ff4f93a09be9e68117b0302e4ae1 - fingerprint: 40bec4155435ff4f93a09be9e68117b0302e4ae1 - sha1: f1a43af2fbf4c86589ba9db52a97d8c808704c8e -- name: rep_windows - version: 51f58a23232c83708338d65b76ce141c9ee62083 - fingerprint: 51f58a23232c83708338d65b76ce141c9ee62083 - sha1: af3253f303d17bcbdc91c551d65096d4648a6b56 -- name: route_emitter - version: 7252da78169a5bc463bdeee2d946a3aacd15dd44 - fingerprint: 7252da78169a5bc463bdeee2d946a3aacd15dd44 - sha1: eb7f90768dbec774ffa9f60126ca6225d8dff5db -- name: route_emitter_windows - version: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 - fingerprint: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 - sha1: 9021e27b20a00503409e1723616c0fef301c639d -- name: ssh_proxy - version: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d - fingerprint: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d - sha1: bd2649784bd2db2b62f4217bd48cf2e6f3307184 -- name: vizzini - version: 6b951848a1d8095e11cc360956a001aeae97a345 - fingerprint: 6b951848a1d8095e11cc360956a001aeae97a345 - sha1: 0b06815364973f67a988658f4776bb7eb1c3d8d0 -license: - version: e5665430b5aafd47589f9df4e2345684d3924831 - fingerprint: e5665430b5aafd47589f9df4e2345684d3924831 - sha1: 3dbb1fe81392fb1ff3a58cbaa3f7e05b6980e6b3 -commit_hash: bf03b7f2 -uncommitted_changes: false -name: diego -version: 1.22.0 diff --git a/releases/diego-1.23.0.yml b/releases/diego-1.23.0.yml deleted file mode 100644 index 36f1716a76..0000000000 --- a/releases/diego-1.23.0.yml +++ /dev/null @@ -1,187 +0,0 @@ ---- -packages: -- name: auctioneer - version: 28a97f9b8a6769a0780df168be35d2c6153799b9 - fingerprint: 28a97f9b8a6769a0780df168be35d2c6153799b9 - sha1: 507c496605f8a69499d1bffbd7b272a434c2813a - dependencies: - - golang -- name: bbs - version: 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa - fingerprint: 30a5f4b67a8b4766a901cee1bd713b4ee267d9aa - sha1: 5b5fd0e5f297f323710d6274a178edc12a82a8fe - dependencies: - - golang -- name: benchmark-bbs - version: 06fbc6c7741f2f9018f184a8fabf378967a0064b - fingerprint: 06fbc6c7741f2f9018f184a8fabf378967a0064b - sha1: e0d21eca295ab439a741cfde3d5f4ad480b354dc - dependencies: - - golang -- name: buildpack_app_lifecycle - version: ea41f1666258427696c033b8b8b23b789ded3115 - fingerprint: ea41f1666258427696c033b8b8b23b789ded3115 - sha1: 9e56b0d90d98c59a076d5ad8a7158512762991f1 - dependencies: - - diego-sshd - - golang - - healthcheck -- name: cfdot - version: 6354c1d785f2aef443958877ebe9f5264567dba1 - fingerprint: 6354c1d785f2aef443958877ebe9f5264567dba1 - sha1: 576dfb9e6c56e76fa5701b0eebb6e6b5a0883c66 - dependencies: - - golang -- name: diego-sshd - version: d2ebf26754a19b68eebb49d5b967efc33be2e45d - fingerprint: d2ebf26754a19b68eebb49d5b967efc33be2e45d - sha1: 9d81e3900361df2a29631422ce3656f8b5b94276 - dependencies: - - golang -- name: docker_app_lifecycle - version: bbe7d156987f3ff9108b2732b457fd4b037043fd - fingerprint: bbe7d156987f3ff9108b2732b457fd4b037043fd - sha1: 494f029ea2fe4b11f92fc16d8030e8fd426c2c13 - dependencies: - - diego-sshd - - golang - - healthcheck -- name: file_server - version: acc0f630405c5bc158cb2e15895f2e11a6cd03ee - fingerprint: acc0f630405c5bc158cb2e15895f2e11a6cd03ee - sha1: 9f5dcf24bca69106015371f05a0f6fb1b1789fca - dependencies: - - golang -- name: golang-windows - version: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 - fingerprint: d40239bb4d87abf7271c1d0d35c0cec7eb8eafb3 - sha1: bd627bc213dd1d2c207ce469540c8c915139fcc0 - dependencies: [] -- name: golang - version: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 - fingerprint: 6b1bfba0bc0455c57678161490ce4fa4fd5f70f4 - sha1: 958c65e49f9457ecc08f028a1aea3c94651eada6 - dependencies: [] -- name: healthcheck - version: 9cf72206a74667125ff277cc24635868e2dc2339 - fingerprint: 9cf72206a74667125ff277cc24635868e2dc2339 - sha1: e7cd74b0e081e771df08935ef06f2488e40b34e3 - dependencies: - - golang -- name: healthcheck_windows - version: b01597a98498c20b30f81668369bfc60c1f5fc74 - fingerprint: b01597a98498c20b30f81668369bfc60c1f5fc74 - sha1: ed4bc37bbd4bb169ac75a3717eeeb4e18145698d - dependencies: - - golang-windows -- name: locket - version: c175ba572774e7de3699f6f4792d1874a6c311ea - fingerprint: c175ba572774e7de3699f6f4792d1874a6c311ea - sha1: 37bfd00827c3b890fe9a2b356b1f60432e330315 - dependencies: - - golang -- name: pid_utils - version: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 - fingerprint: df9c92d8d2daa1806afe7a38d332a6fd59a8abc0 - sha1: 6ada005648f7f631cd9fef1685574e27be88c913 - dependencies: [] -- name: rep - version: f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d - fingerprint: f4c79b528e0ae09dc0d48222803bb9c9ef9e8b7d - sha1: 7fd6b8b8466ac3e7435611b0efd6883cff94c633 - dependencies: - - golang -- name: rep_windows - version: ca26b06a8ce7615ef990d7d9f6392a4efc29346d - fingerprint: ca26b06a8ce7615ef990d7d9f6392a4efc29346d - sha1: 74cbf7221b2f4aa3e897b495017c3647ab354508 - dependencies: - - golang-windows -- name: route_emitter - version: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e - fingerprint: 1c654f8eb890ea8f0facc7a6cfba03772c7d337e - sha1: 7abadbc1eb972b2a0738b77d2ded0ea979c07494 - dependencies: - - golang -- name: route_emitter_windows - version: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 - fingerprint: 6010e662a112f70b8a63a3f3ecbbae0b5b2020b2 - sha1: c0cc10917c7c2900f8ebe7e663810d280a8d333a - dependencies: - - golang-windows -- name: ssh_proxy - version: 3d37c0edadad1418071ba2d59231ab424fac6833 - fingerprint: 3d37c0edadad1418071ba2d59231ab424fac6833 - sha1: 0561aa0de62fb3b8ed8b63ad2514667756ea1848 - dependencies: - - golang -- name: vizzini - version: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b - fingerprint: fe3db454b9f64f6aa81c8dcb1f14d19157a98b1b - sha1: a400ceb9966cd3bfc87f47f24ed1b9e47d38eab6 - dependencies: - - golang -- name: windows_app_lifecycle - version: b611468c8a02374fd18609608bf8703519a23aa4 - fingerprint: b611468c8a02374fd18609608bf8703519a23aa4 - sha1: 09a5fcc7d73a7f8af73715cf634076a1ca4264d2 - dependencies: - - diego-sshd - - healthcheck -jobs: -- name: auctioneer - version: 098f17c636e82c8f1bffcf7524ccbec85ba0026c - fingerprint: 098f17c636e82c8f1bffcf7524ccbec85ba0026c - sha1: 03f69d701eaa269a9f583754e0bd2b2a5ca822fa -- name: bbs - version: 85652b024b54f0e9f248bb61766ea321814a17ba - fingerprint: 85652b024b54f0e9f248bb61766ea321814a17ba - sha1: 767771de54da120681c6ab7c62edbb5fb0c154e6 -- name: benchmark-bbs - version: e023423f093d3ce5be53bbce30b4823852506078 - fingerprint: e023423f093d3ce5be53bbce30b4823852506078 - sha1: 8748824ae24919bed064ee1cda208b993b52a6fb -- name: cfdot - version: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 - fingerprint: 666cec3e5b980ead0d47f0dcf13efe02904f4c55 - sha1: ec3a4f1ef05c1638d4e4f12fe630a34d27e9fc4d -- name: file_server - version: de829eb0408806028a4010c6018f3e87b5190c05 - fingerprint: de829eb0408806028a4010c6018f3e87b5190c05 - sha1: 30bcef30b16d1445dc7e6b92dc4c7a015f5975e5 -- name: locket - version: f4f379943bab0f5fa0a9727d82b91760eb52a81e - fingerprint: f4f379943bab0f5fa0a9727d82b91760eb52a81e - sha1: 8b964808937f54c50c684506d7d89d84e5270b2c -- name: rep - version: 40bec4155435ff4f93a09be9e68117b0302e4ae1 - fingerprint: 40bec4155435ff4f93a09be9e68117b0302e4ae1 - sha1: f1a43af2fbf4c86589ba9db52a97d8c808704c8e -- name: rep_windows - version: 51f58a23232c83708338d65b76ce141c9ee62083 - fingerprint: 51f58a23232c83708338d65b76ce141c9ee62083 - sha1: af3253f303d17bcbdc91c551d65096d4648a6b56 -- name: route_emitter - version: 7252da78169a5bc463bdeee2d946a3aacd15dd44 - fingerprint: 7252da78169a5bc463bdeee2d946a3aacd15dd44 - sha1: eb7f90768dbec774ffa9f60126ca6225d8dff5db -- name: route_emitter_windows - version: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 - fingerprint: 40a94e346f7fb461b4705c5ebb21a83ef5c38d58 - sha1: 9021e27b20a00503409e1723616c0fef301c639d -- name: ssh_proxy - version: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d - fingerprint: 5306a9c2fd7894f231dfc4b6f4f55adc8f576e3d - sha1: bd2649784bd2db2b62f4217bd48cf2e6f3307184 -- name: vizzini - version: 6b951848a1d8095e11cc360956a001aeae97a345 - fingerprint: 6b951848a1d8095e11cc360956a001aeae97a345 - sha1: 0b06815364973f67a988658f4776bb7eb1c3d8d0 -license: - version: e5665430b5aafd47589f9df4e2345684d3924831 - fingerprint: e5665430b5aafd47589f9df4e2345684d3924831 - sha1: 3dbb1fe81392fb1ff3a58cbaa3f7e05b6980e6b3 -commit_hash: edb126ad -uncommitted_changes: false -name: diego -version: 1.23.0 diff --git a/releases/index.yml b/releases/index.yml index 9815860894..619ead2fd0 100644 --- a/releases/index.yml +++ b/releases/index.yml @@ -1302,8 +1302,4 @@ builds: version: 1.20.0 02b5f1f8-14da-4720-a983-3cefa490ec8d: version: 1.21.0 - 42025cd2-b2a2-4344-91e3-b145aeb8eb4d: - version: 1.22.0 - ea312499-ce6e-49f9-bfe4-69a076c636c9: - version: 1.23.0 format-version: '2' diff --git a/scripts/update b/scripts/update index 1430aa23dd..07821481b2 100755 --- a/scripts/update +++ b/scripts/update @@ -15,6 +15,9 @@ function has_upstream() { set -x -e scripts_dir="$(cd $(dirname $0) && pwd)" +if [ -d "$(dirname "$scripts_dir")/.git" ] ; then + "$scripts_dir"/install-git-hooks +fi has_upstream && git pull @@ -24,6 +27,3 @@ else git submodule sync --recursive && git submodule foreach --recursive git submodule sync && git submodule update --init --recursive fi -if [ -d "$(dirname "$scripts_dir")/.git" ] ; then - "$scripts_dir"/install-git-hooks -fi diff --git a/src/code.cloudfoundry.org/auctioneer b/src/code.cloudfoundry.org/auctioneer index 87b4d67f93..98f10e6819 160000 --- a/src/code.cloudfoundry.org/auctioneer +++ b/src/code.cloudfoundry.org/auctioneer @@ -1 +1 @@ -Subproject commit 87b4d67f9315dd705748aca63b0076f1cdec2c45 +Subproject commit 98f10e68199fdeec15157198b59affee7b5b554a diff --git a/src/code.cloudfoundry.org/bbs b/src/code.cloudfoundry.org/bbs index a1e0becf09..16208c27cc 160000 --- a/src/code.cloudfoundry.org/bbs +++ b/src/code.cloudfoundry.org/bbs @@ -1 +1 @@ -Subproject commit a1e0becf0948b7e62912e09ce411442ad6d347db +Subproject commit 16208c27cc3c7bf7f6284627fbf8c4aba91b0f60 diff --git a/src/code.cloudfoundry.org/benchmarkbbs b/src/code.cloudfoundry.org/benchmarkbbs index 6d2ad464da..3ae15bcc3f 160000 --- a/src/code.cloudfoundry.org/benchmarkbbs +++ b/src/code.cloudfoundry.org/benchmarkbbs @@ -1 +1 @@ -Subproject commit 6d2ad464daa1f7d9c43f2449f932f110578b59ca +Subproject commit 3ae15bcc3f962ae71bfcf5ec3673a792379368a6 diff --git a/src/code.cloudfoundry.org/buildpackapplifecycle b/src/code.cloudfoundry.org/buildpackapplifecycle index bbd4bb3ad0..554a15cdf2 160000 --- a/src/code.cloudfoundry.org/buildpackapplifecycle +++ b/src/code.cloudfoundry.org/buildpackapplifecycle @@ -1 +1 @@ -Subproject commit bbd4bb3ad0cef4b3c9392e202ffbdc6e9ee016ce +Subproject commit 554a15cdf273fa9781b0e4d5379e72886ca280f6 diff --git a/src/code.cloudfoundry.org/cfdot b/src/code.cloudfoundry.org/cfdot index 677ecc77c1..7652a61247 160000 --- a/src/code.cloudfoundry.org/cfdot +++ b/src/code.cloudfoundry.org/cfdot @@ -1 +1 @@ -Subproject commit 677ecc77c1640008b1d7a7cb944ff48e9ea6cab2 +Subproject commit 7652a61247f5485c79df33717715b86c8d7b04f0 diff --git a/src/code.cloudfoundry.org/diego-ssh b/src/code.cloudfoundry.org/diego-ssh index 5c819b8d17..19d2baa79e 160000 --- a/src/code.cloudfoundry.org/diego-ssh +++ b/src/code.cloudfoundry.org/diego-ssh @@ -1 +1 @@ -Subproject commit 5c819b8d17914d464a99e3c367f671075419064a +Subproject commit 19d2baa79e67e54edc465e3502bc5eeea8f22367 diff --git a/src/code.cloudfoundry.org/diego-upgrade-stability-tests b/src/code.cloudfoundry.org/diego-upgrade-stability-tests index de19faf1a6..d699df1322 160000 --- a/src/code.cloudfoundry.org/diego-upgrade-stability-tests +++ b/src/code.cloudfoundry.org/diego-upgrade-stability-tests @@ -1 +1 @@ -Subproject commit de19faf1a63303d6ef056ca46822ae33c89059a9 +Subproject commit d699df13224b90face45d65772301464969f14fc diff --git a/src/code.cloudfoundry.org/dockerapplifecycle b/src/code.cloudfoundry.org/dockerapplifecycle index 6c11c768fa..574621fb46 160000 --- a/src/code.cloudfoundry.org/dockerapplifecycle +++ b/src/code.cloudfoundry.org/dockerapplifecycle @@ -1 +1 @@ -Subproject commit 6c11c768fa6f5a77f2ab53c820040e9ab87f9c1b +Subproject commit 574621fb46ed8b4ff9c421257a1a2f783531b4e2 diff --git a/src/code.cloudfoundry.org/executor b/src/code.cloudfoundry.org/executor index 8140a9696b..38219913ff 160000 --- a/src/code.cloudfoundry.org/executor +++ b/src/code.cloudfoundry.org/executor @@ -1 +1 @@ -Subproject commit 8140a9696b51f94c4317665f93933cbe5119f16a +Subproject commit 38219913ffd571bd5f66da45560883cad764cd97 diff --git a/src/code.cloudfoundry.org/go-loggregator b/src/code.cloudfoundry.org/go-loggregator index 1c991136f3..b1525c9ace 160000 --- a/src/code.cloudfoundry.org/go-loggregator +++ b/src/code.cloudfoundry.org/go-loggregator @@ -1 +1 @@ -Subproject commit 1c991136f3e2de106a36e9c78b8c6ece8f46d67e +Subproject commit b1525c9acecd9ccbfe91592ccb4e2d6fa6eab200 diff --git a/src/code.cloudfoundry.org/guardian b/src/code.cloudfoundry.org/guardian index d0c9f6bfd3..0272c51f32 160000 --- a/src/code.cloudfoundry.org/guardian +++ b/src/code.cloudfoundry.org/guardian @@ -1 +1 @@ -Subproject commit d0c9f6bfd32f44cc26a115cceae5f036fd0be019 +Subproject commit 0272c51f324eae1ab96a3b158ac8af2efe48173a diff --git a/src/code.cloudfoundry.org/healthcheck b/src/code.cloudfoundry.org/healthcheck index 2c8e6a82b7..2461471eac 160000 --- a/src/code.cloudfoundry.org/healthcheck +++ b/src/code.cloudfoundry.org/healthcheck @@ -1 +1 @@ -Subproject commit 2c8e6a82b7584d6dcfd9a81fcc01947a59fa62d5 +Subproject commit 2461471eacc8f123e5e1d6634151d26dfc306eaf diff --git a/src/code.cloudfoundry.org/inigo b/src/code.cloudfoundry.org/inigo index 5b946d72d1..ba35dd753b 160000 --- a/src/code.cloudfoundry.org/inigo +++ b/src/code.cloudfoundry.org/inigo @@ -1 +1 @@ -Subproject commit 5b946d72d1ab39d4ba6a04013938043406ed13a7 +Subproject commit ba35dd753b5c80d6d0ef8d29e7972455e6f3f3bb diff --git a/src/code.cloudfoundry.org/lager b/src/code.cloudfoundry.org/lager index 438ab98cc3..dfcbcba2dd 160000 --- a/src/code.cloudfoundry.org/lager +++ b/src/code.cloudfoundry.org/lager @@ -1 +1 @@ -Subproject commit 438ab98cc3b9b81e97c2281422b2722cd8e80ed8 +Subproject commit dfcbcba2dd4a5228c43b0292d219d5c010daed3a diff --git a/src/code.cloudfoundry.org/locket b/src/code.cloudfoundry.org/locket index ea68c62374..79f2e81fed 160000 --- a/src/code.cloudfoundry.org/locket +++ b/src/code.cloudfoundry.org/locket @@ -1 +1 @@ -Subproject commit ea68c623742367078c2a660543cde875faea2532 +Subproject commit 79f2e81fed4e4745ba00d2014fae1f63762951a3 diff --git a/src/code.cloudfoundry.org/route-emitter b/src/code.cloudfoundry.org/route-emitter index dc584c5a0b..1a74604862 160000 --- a/src/code.cloudfoundry.org/route-emitter +++ b/src/code.cloudfoundry.org/route-emitter @@ -1 +1 @@ -Subproject commit dc584c5a0b41da0bd7289f8aa46966604e2599a1 +Subproject commit 1a74604862d0d3c1c8174315d7bf0e3be91623c6 diff --git a/src/code.cloudfoundry.org/vizzini b/src/code.cloudfoundry.org/vizzini index d39bf47d7f..bbe672752a 160000 --- a/src/code.cloudfoundry.org/vizzini +++ b/src/code.cloudfoundry.org/vizzini @@ -1 +1 @@ -Subproject commit d39bf47d7f48c9263031d8384015b31499bf372b +Subproject commit bbe672752acf36317bf8f788c10abbe2643e2d60 diff --git a/src/code.cloudfoundry.org/workpool b/src/code.cloudfoundry.org/workpool index 99757edba7..0e2024d2a9 160000 --- a/src/code.cloudfoundry.org/workpool +++ b/src/code.cloudfoundry.org/workpool @@ -1 +1 @@ -Subproject commit 99757edba73523adac0d2460f4c3555f938663b5 +Subproject commit 0e2024d2a925068519f6ba470d11f8b735ecd4f4 diff --git a/src/github.com/go-sql-driver/mysql b/src/github.com/go-sql-driver/mysql index 198451155c..66312f7fe2 160000 --- a/src/github.com/go-sql-driver/mysql +++ b/src/github.com/go-sql-driver/mysql @@ -1 +1 @@ -Subproject commit 198451155c14185d6f77f22a5cfd8050087073f3 +Subproject commit 66312f7fe2678aa0f5ec770f96702f4c4ec5aa8e