Merge branch 'develop' into adapt-failed-jobs-to-run-frequently

.final_builds/jobs/cc_deployment_updater/index.yml

@@ -1,4 +1,8 @@
 builds:
+  08aba220a7fbdace8ddc904f673d1fb2822bd10a629eca8a3679463574adbd7e:
+    version: 08aba220a7fbdace8ddc904f673d1fb2822bd10a629eca8a3679463574adbd7e
+    blobstore_id: 21535abd-8106-47b5-5df7-8dcbbf74cb15
+    sha1: sha256:681fb29bbc9ac5ca6299b754c346d1dfdf7ba807c9d35e253c4d1c35b66ffb7f
   19349c7c1effab16cec058ef0fc3286e5e834c93a966851e63b4699f2bb445fd:
     version: 19349c7c1effab16cec058ef0fc3286e5e834c93a966851e63b4699f2bb445fd
     blobstore_id: 5f43ff38-2fd4-43c9-64bc-6d325acc6e40

.final_builds/jobs/cloud_controller_clock/index.yml

@@ -51,6 +51,10 @@ builds:
     version: 225d9a2ba0d428871d498dc78ef712cda007a5305dd78e6320afc00c8bef9600
     blobstore_id: 489eb068-8883-4a86-593c-f0c3894466db
     sha1: sha256:498b1338fc1a63fd589e2d4459f86d979e5c54215af0d489044ecc5a510df4f8
+  2d515f85bcdc9497251c0bd45ae3e0fa3170714cd391d7c76a9b19cd3a3c8b20:
+    version: 2d515f85bcdc9497251c0bd45ae3e0fa3170714cd391d7c76a9b19cd3a3c8b20
+    blobstore_id: 489ad36e-4a0e-4906-7b2d-85293947a5a7
+    sha1: sha256:b638d7ec95cc14a4530de7ec5e3a30b8d600c6f8bcb01c18f037f883991fd8ce
   3308e90a258a53884f2cbe0062d8de9f5ab580b6b5da1b238f86ff69b8dd6729:
     version: 3308e90a258a53884f2cbe0062d8de9f5ab580b6b5da1b238f86ff69b8dd6729
     blobstore_id: 19a36b23-b637-447c-6483-a6f5510e6119

.final_builds/jobs/cloud_controller_ng/index.yml

@@ -163,6 +163,10 @@ builds:
     version: 622006288fa8710ec56a9e2fc8973e858e2fdd041c1dc8d6f417bc15d1d63866
     blobstore_id: af074eb6-b75c-4d9e-78f6-c3ce1e1dbed4
     sha1: sha256:c0dc110814f6edf422ce18058afe43144c99ff21d82301afdc952d719a7aac5f
+  66ef87dae673d9e9c7fea469f952cd78e557780b388bc6a55802dc138df80ef5:
+    version: 66ef87dae673d9e9c7fea469f952cd78e557780b388bc6a55802dc138df80ef5
+    blobstore_id: 412432f1-e6cc-4c9e-5310-065115be9b1a
+    sha1: sha256:92555af60754dba8d61ae0e8777cabb5857c05771e2e7de0fbd9172c55be3ab0
   68db5ca5994c997b4e1a76d07af9086f0a719e78d30c77c47e5f4cfdce7f199a:
     version: 68db5ca5994c997b4e1a76d07af9086f0a719e78d30c77c47e5f4cfdce7f199a
     blobstore_id: 270838e1-9d8a-4495-4fd7-d036bb532dc3

.final_builds/jobs/cloud_controller_worker/index.yml

@@ -199,6 +199,10 @@ builds:
     version: a452bbd9d359a8edd3cea2b6d45ee40329105239815170143299131673c577d7
     blobstore_id: d7f91cab-4cfe-448b-479f-297a07a2f1aa
     sha1: sha256:08145ec1d0dd0961b58c1528d80027b530f983409673339b85ae16d2df7d754c
+  a4688ac4fdba47c1f55d28abc01dcbaf67035e61308913591a696699d5d1ca99:
+    version: a4688ac4fdba47c1f55d28abc01dcbaf67035e61308913591a696699d5d1ca99
+    blobstore_id: b1cfb906-5777-4068-5535-71f6040b5cc6
+    sha1: sha256:11795fb6b8f04acd703fe509fc1d486a8d0cf01c033ffa0f3da8f40e573e0141
   a4e83c521ea5bfdeb5afaf79fd7ce270177d80c65f9ac77d97a5a4183e77ca14:
     version: a4e83c521ea5bfdeb5afaf79fd7ce270177d80c65f9ac77d97a5a4183e77ca14
     blobstore_id: a71ffcd0-c11a-4309-731b-beee7aaed0e1

.final_builds/packages/cc_uploader/index.yml

@@ -147,6 +147,10 @@ builds:
     version: 980a78508443a2acb034101f818cc96123a787cb6bd826de49930d9215bbd40d
     blobstore_id: f2bdb411-e44c-488a-5938-03ab4d70ee1f
     sha1: sha256:f38ee5365f0dfffe86125fc9690531b37d53ae4b52eebb7c1efc9bd6dd67a73e
+  a02c71ad55405c4c4a723b3854a908d202fa999587ff49463e651c296f484f19:
+    version: a02c71ad55405c4c4a723b3854a908d202fa999587ff49463e651c296f484f19
+    blobstore_id: 7453c72f-a844-47b6-799d-d450749d01b9
+    sha1: sha256:4442e04ef968b01a105d47fbc7432fba9700033ad3ce98ade87ce71d3e4c49d3
   a1d5d778e818aa5eb1d52484c9699d3305fb7267:
     version: a1d5d778e818aa5eb1d52484c9699d3305fb7267
     blobstore_id: 511e801c-8113-46d7-973e-444769565e73

.final_builds/packages/cloud_controller_ng/index.yml

@@ -507,6 +507,10 @@ builds:
     version: d431a56d4b23d7355c1f2f690f82a6a14a79d2e637f2a40db62286d874f4bbd4
     blobstore_id: cf8f46d9-b631-417d-635e-2c6ad4b42383
     sha1: sha256:458649501ffce64a71b6f6312bd5fad9fe840b26eb4ddc1b4f4e671afeb5f6e4
+  d64f470044f56028af4c09b5ba12a288288df1a33fc8e8660bc1755665efdd2a:
+    version: d64f470044f56028af4c09b5ba12a288288df1a33fc8e8660bc1755665efdd2a
+    blobstore_id: 07546487-9764-408d-5bb2-d1e92080f0fd
+    sha1: sha256:98f4d077240ed39150a0837901151690d84ff07629cf92fc149bce850d1df45e
   d8261fab26d351ac14d55c896e3ddb3269bd98d5d57ac10d5f438b00c7004d11:
     version: d8261fab26d351ac14d55c896e3ddb3269bd98d5d57ac10d5f438b00c7004d11
     blobstore_id: 3fb0b21d-ed13-4db8-638e-850d6bb0c8b7

.final_builds/packages/tps/index.yml

@@ -219,6 +219,10 @@ builds:
     version: e85a19e7d88d55ab667eee022c200ec0b13cdbeef222b85a541d9729a6311e82
     blobstore_id: 7d0ae033-6a85-4d72-4678-cea64f6c37a0
     sha1: sha256:88f0b4128e427e5b6b5cca2c9a2ba06b9c8d4037cd90997247eef1028fbdc31f
+  e8737bb724e468e4dd1d426cc6814e86e31d911098d7decd8b7566bc8cce8716:
+    version: e8737bb724e468e4dd1d426cc6814e86e31d911098d7decd8b7566bc8cce8716
+    blobstore_id: 9118f2d1-9855-44ac-5919-25309a8283b1
+    sha1: sha256:70635453cadfd1575ab4ff174d05ee4825f10cd2564dc8a3ba8700eee3c4d074
   e8dd9d305c30797064f636f08d923750115a4a0c4073219023902754d218959e:
     version: e8dd9d305c30797064f636f08d923750115a4a0c4073219023902754d218959e
     blobstore_id: 1eae5b86-943f-4fea-4bbd-5e0caebbdad2

jobs/cc_deployment_updater/spec

@@ -215,13 +215,3 @@ properties:
   cc.locket.port:
     default: 8891
     description: "Port of the Locket server"
-
-  cc.opi.enabled:
-    description: "Set to true to enable running apps on Kubernetes, using Eirini"
-    default: false
-  cc.opi.opi_staging:
-    description: "Set to true to enable staging apps on Kubernetes, using Eirini"
-    default: false
-  cc.opi.url:
-    description: "URL of the Eirini server"
-    default: ""

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

@@ -206,11 +206,6 @@ packages:
   fog_connection: <%= link("cloud_controller_internal").p("cc.packages.fog_connection", {}).to_json %>
   fog_aws_storage_options: <%= link("cloud_controller_internal").p("cc.packages.fog_aws_storage_options", {}).to_json %>
 
-opi:
-  url: "<%= p("cc.opi.url") %>"
-  opi_staging: <%= p("cc.opi.opi_staging") %>
-  enabled: <%= p("cc.opi.enabled") %>
-
 droplets:
   blobstore_type: <%= link("cloud_controller_internal").p("cc.droplets.blobstore_type") %>
   webdav_config:

jobs/cloud_controller_clock/spec

@@ -26,10 +26,6 @@ templates:
   db_ca.crt.erb: config/certs/db_ca.crt
   credhub_ca.crt.erb: config/certs/credhub_ca.crt
 
-  opi_tls.crt.erb: config/certs/opi_tls.crt
-  opi_tls.key.erb: config/certs/opi_tls.key
-  opi_tls_ca.crt.erb: config/certs/opi_tls_ca.crt
-
 packages:
   - capi_utils
   - cloud_controller_ng

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

@@ -331,16 +331,6 @@ diego:
     receive_timeout: <%= p("cc.diego.bbs.receive_timeout") %>
   pid_limit: <%= p("cc.diego.pid_limit") %>
 
-opi:
-  url: "<%= link("cloud_controller_internal").p("cc.opi.url") %>"
-  opi_staging: <%= link("cloud_controller_internal").p("cc.opi.opi_staging") %>
-  enabled: <%= link("cloud_controller_internal").p("cc.opi.enabled") %>
-<% link("cloud_controller_internal").if_p("cc.opi.client_cert", "cc.opi.client_key", "cc.opi.ca_cert") do %>
-  ca_file: /var/vcap/jobs/cloud_controller_clock/config/certs/opi_tls_ca.crt
-  client_cert_file: /var/vcap/jobs/cloud_controller_clock/config/certs/opi_tls.crt
-  client_key_file: /var/vcap/jobs/cloud_controller_clock/config/certs/opi_tls.key
-<% end %>
-
 <% if p("routing_api.enabled") %>
 routing_api:
   url: <%= "https://api.#{system_domain}/routing" %>

jobs/cloud_controller_ng/spec

@@ -27,7 +27,6 @@ templates:
   logcache_tls.crt.erb: config/certs/logcache_tls.crt
   logcache_tls.key.erb: config/certs/logcache_tls.key
   logcache_tls_ca.crt.erb: config/certs/logcache_tls_ca.crt
-  kubernetes_ca.crt.erb: config/certs/kubernetes_ca.crt
   nginx_external_endpoints.conf.erb: config/nginx_external_endpoints.conf
   migrate_db.sh.erb: bin/migrate_db
   mime.types: config/mime.types
@@ -42,9 +41,6 @@ templates:
   newrelic_plugin.yml.erb: config/newrelic_plugin.yml
   nginx.conf.erb: config/nginx.conf
   nginx_maintenance.conf.erb: config/nginx_maintenance.conf
-  opi_tls.crt.erb: config/certs/opi_tls.crt
-  opi_tls.key.erb: config/certs/opi_tls.key
-  opi_tls_ca.crt.erb: config/certs/opi_tls_ca.crt
   packages_ca_cert.pem.erb: config/certs/packages_ca_cert.pem
   perform_blobstore_benchmarks.erb: bin/perform_blobstore_benchmarks
   post-start.sh.erb: bin/post-start
@@ -164,12 +160,6 @@ provides:
   - cc.max_labels_per_resource
   - cc.max_annotations_per_resource
   - cc.maximum_health_check_timeout
-  - cc.opi.ca_cert
-  - cc.opi.client_cert
-  - cc.opi.client_key
-  - cc.opi.enabled
-  - cc.opi.opi_staging
-  - cc.opi.url
   - cc.packages.app_package_directory_key
   - cc.packages.blobstore_type
   - cc.packages.cdn.key_pair_id
@@ -648,22 +638,6 @@ properties:
     description: "Key pair name for signed download URIs"
     default: ""
 
-  cc.opi.enabled:
-    description: "Set to true to enable running apps on Kubernetes, using Eirini"
-    default: false
-  cc.opi.opi_staging:
-    description: "Set to true to enable staging apps on Kubernetes, using Eirini"
-    default: false
-  cc.opi.url:
-    description: "URL of the Eirini server"
-    default: ""
-  cc.opi.client_cert:
-    description: "Client certificate for connecting to the OPI server"
-  cc.opi.client_key:
-    description: "Client key for connecting to the OPI server"
-  cc.opi.ca_cert:
-    description: "The ca cert of the OPI server"
-
   ccdb.databases:
     description: "Contains the name of the database on the database server"
   ccdb.roles:
@@ -942,6 +916,8 @@ properties:
   cc.renderer.max_inline_relations_depth:
     description: "Maximum depth of inlined relationships in the result"
     default: 2
+  cc.renderer.max_total_results:
+    description: "Maximum number of total results (page * per_page)"
 
   uaa.clients.cc_service_broker_client.secret:
     description: "(DEPRECATED) - Used for generating SSO clients for service brokers"
@@ -1224,21 +1200,6 @@ properties:
     description: "Maximum number of threads per Puma webserver worker."
     default: 2
 
-  cc.kubernetes.host_url:
-    description: "Kubernetes master API URL"
-  cc.kubernetes.service_account.name:
-    description: "The Kubernetes service account name"
-  cc.kubernetes.service_account.token:
-    description: "The Kubernetes service account token"
-  cc.kubernetes.ca:
-    description: "The CA certificate for connecting to the master"
-  cc.kubernetes.kpack.builder_namespace:
-    description: "The namespace where kpack images and builds will be created"
-  cc.kubernetes.kpack.registry_service_account_name:
-    description: "The name of the kubernetes ServiceAccount that has the credentials to upload to the registry"
-  cc.kubernetes.kpack.registry_tag_base:
-    description: "The first part of the registry tag where built images will be uploaded"
-
   cc.update_metric_tags_on_rename:
     description: "Enable sending a Desired LRP update when an app is renamed"
     default: true

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

@@ -393,6 +393,9 @@ renderer:
   max_results_per_page: <%= p("cc.renderer.max_results_per_page") %>
   default_results_per_page: <%= p("cc.renderer.default_results_per_page") %>
   max_inline_relations_depth: <%= p("cc.renderer.max_inline_relations_depth") %>
+  <% if_p("cc.renderer.max_total_results") do |max_total_results| %>
+  max_total_results: <%= max_total_results %>
+  <% end %>
 
 <% if_p("uaa.clients.cc_service_broker_client.secret") do %>
 uaa_client_name: "cc_service_broker_client"
@@ -498,16 +501,6 @@ diego:
   use_privileged_containers_for_running: <%= p("cc.diego.use_privileged_containers_for_running") %>
   use_privileged_containers_for_staging: <%= p("cc.diego.use_privileged_containers_for_staging") %>
 
-opi:
-  url: "<%= p("cc.opi.url") %>"
-  opi_staging: <%= p("cc.opi.opi_staging") %>
-  enabled: <%= p("cc.opi.enabled") %>
-  cc_uploader_url: "<%= cc_uploader_url %>"
-<% if_p("cc.opi.client_cert", "cc.opi.client_key", "cc.opi.ca_cert") do %>
-  ca_file: /var/vcap/jobs/cloud_controller_ng/config/certs/opi_tls_ca.crt
-  client_cert_file: /var/vcap/jobs/cloud_controller_ng/config/certs/opi_tls.crt
-  client_key_file: /var/vcap/jobs/cloud_controller_ng/config/certs/opi_tls.key
-<% end %>
 perm:
   enabled: false
 
@@ -537,24 +530,6 @@ internal_route_vip_range: <%= internal_vip_range %>
 
 threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %>
 
-<% if_p("cc.kubernetes.host_url") do %>
-kubernetes:
-  host_url: <%= p("cc.kubernetes.host_url") %>
-
-  service_account:
-    name: <%= p("cc.kubernetes.service_account.name") %>
-    token: <%= p("cc.kubernetes.service_account.token") %>
-
-  ca_file: /var/vcap/jobs/cloud_controller_ng/config/certs/kubernetes_ca.crt
-
-  <% if_p("cc.kubernetes.kpack.builder_namespace") do %>
-  kpack:
-    builder_namespace: <%= p("cc.kubernetes.kpack.builder_namespace") %>
-    registry_service_account_name: <%= p("cc.kubernetes.kpack.registry_service_account_name") %>
-    registry_tag_base: <%= p("cc.kubernetes.kpack.registry_tag_base") %>
-  <% end %>
-<% end %>
-
 default_app_lifecycle: buildpack
 custom_metric_tag_prefix_list: <%= p("cc.custom_metric_tag_prefix_list") %>
 update_metric_tags_on_rename: <%= p("cc.update_metric_tags_on_rename") %>

jobs/cloud_controller_worker/spec

@@ -34,10 +34,6 @@ templates:
   copilot.crt.erb: config/certs/copilot.crt
   copilot.key.erb: config/certs/copilot.key
 
-  opi_tls.crt.erb: config/certs/opi_tls.crt
-  opi_tls.key.erb: config/certs/opi_tls.key
-  opi_tls_ca.crt.erb: config/certs/opi_tls_ca.crt
-
 packages:
   - capi_utils
   - cloud_controller_ng

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

@@ -310,16 +310,6 @@ diego:
     receive_timeout: <%= p("cc.diego.bbs.receive_timeout") %>
   pid_limit: <%= p("cc.diego.pid_limit") %>
 
-opi:
-  url: "<%= link("cloud_controller_internal").p("cc.opi.url") %>"
-  opi_staging: <%= link("cloud_controller_internal").p("cc.opi.opi_staging") %>
-  enabled: <%= link("cloud_controller_internal").p("cc.opi.enabled") %>
-<% link("cloud_controller_internal").if_p("cc.opi.client_cert", "cc.opi.client_key", "cc.opi.ca_cert") do %>
-  ca_file: /var/vcap/jobs/cloud_controller_worker/config/certs/opi_tls_ca.crt
-  client_cert_file: /var/vcap/jobs/cloud_controller_worker/config/certs/opi_tls.crt
-  client_key_file: /var/vcap/jobs/cloud_controller_worker/config/certs/opi_tls.key
-<% end %>
-
 <% if p("routing_api.enabled") %>
 routing_api:
   url: <%= "https://api.#{system_domain}/routing" %>