From 03f30c11c437bb175a2446895747245a518c9a3e Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Tue, 18 Jul 2023 23:19:43 +0000
Subject: [PATCH 01/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  Geoff Franks:
     Adds run_rootfs_image and build_rootfs_image stack properties to API output (#3330)
  Philipp Thun:
     Merge pull request #3348 from cloudfoundry/dependabot/bundler/rubocop-1.54.2
  M. Oleske:
     Fix rubocop issues
  dependabot[bot]:
     build(deps-dev): bump rubocop from 1.54.1 to 1.54.2
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index 1e3aa63048..9b783b0126 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit 1e3aa63048268c2d039f2718bf895e08efb9bda3
+Subproject commit 9b783b01266ff909035bb9824ad06729703e084d

From 67cedab1591398523214410af5fd79544fc49c3b Mon Sep 17 00:00:00 2001
From: "M. Oleske" <moleske@users.noreply.github.com>
Date: Wed, 19 Jul 2023 10:52:22 -0700
Subject: [PATCH 02/13] Remove kubernetes configuration (#287)

---
 jobs/cc_deployment_updater/spec               | 10 -----
 .../templates/cloud_controller_ng.yml.erb     |  5 ---
 jobs/cloud_controller_clock/spec              |  4 --
 .../templates/cloud_controller_ng.yml.erb     | 10 -----
 .../templates/opi_tls.crt.erb                 |  3 --
 .../templates/opi_tls.key.erb                 |  3 --
 .../templates/opi_tls_ca.crt.erb              |  3 --
 jobs/cloud_controller_ng/spec                 | 41 -------------------
 .../templates/cloud_controller_ng.yml.erb     | 28 -------------
 .../templates/kubernetes_ca.crt.erb           |  1 -
 .../templates/opi_tls.crt.erb                 |  3 --
 .../templates/opi_tls.key.erb                 |  3 --
 .../templates/opi_tls_ca.crt.erb              |  3 --
 jobs/cloud_controller_worker/spec             |  4 --
 .../templates/cloud_controller_ng.yml.erb     | 10 -----
 .../templates/opi_tls.crt.erb                 |  3 --
 .../templates/opi_tls.key.erb                 |  3 --
 .../templates/opi_tls_ca.crt.erb              |  3 --
 .../cloud_controller_worker_spec.rb           |  6 ---
 19 files changed, 146 deletions(-)
 delete mode 100644 jobs/cloud_controller_clock/templates/opi_tls.crt.erb
 delete mode 100644 jobs/cloud_controller_clock/templates/opi_tls.key.erb
 delete mode 100644 jobs/cloud_controller_clock/templates/opi_tls_ca.crt.erb
 delete mode 100644 jobs/cloud_controller_ng/templates/kubernetes_ca.crt.erb
 delete mode 100644 jobs/cloud_controller_ng/templates/opi_tls.crt.erb
 delete mode 100644 jobs/cloud_controller_ng/templates/opi_tls.key.erb
 delete mode 100644 jobs/cloud_controller_ng/templates/opi_tls_ca.crt.erb
 delete mode 100644 jobs/cloud_controller_worker/templates/opi_tls.crt.erb
 delete mode 100644 jobs/cloud_controller_worker/templates/opi_tls.key.erb
 delete mode 100644 jobs/cloud_controller_worker/templates/opi_tls_ca.crt.erb

diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec
index 60d2cad066..a82721631b 100644
--- a/jobs/cc_deployment_updater/spec
+++ b/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: ""
diff --git a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb
index f1892d3a8c..ef2ca04296 100644
--- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb
+++ b/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:
diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec
index 7161024336..5a98bcf5b4 100644
--- a/jobs/cloud_controller_clock/spec
+++ b/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
diff --git a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
index aedc4010c5..be0d11d448 100644
--- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
+++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
@@ -327,16 +327,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" %>
diff --git a/jobs/cloud_controller_clock/templates/opi_tls.crt.erb b/jobs/cloud_controller_clock/templates/opi_tls.crt.erb
deleted file mode 100644
index 9504c130ee..0000000000
--- a/jobs/cloud_controller_clock/templates/opi_tls.crt.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% link("cloud_controller_internal").if_p("cc.opi.client_cert") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_clock/templates/opi_tls.key.erb b/jobs/cloud_controller_clock/templates/opi_tls.key.erb
deleted file mode 100644
index ef9bf464e2..0000000000
--- a/jobs/cloud_controller_clock/templates/opi_tls.key.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% link("cloud_controller_internal").if_p("cc.opi.client_key") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_clock/templates/opi_tls_ca.crt.erb b/jobs/cloud_controller_clock/templates/opi_tls_ca.crt.erb
deleted file mode 100644
index cc5a294c7e..0000000000
--- a/jobs/cloud_controller_clock/templates/opi_tls_ca.crt.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% link("cloud_controller_internal").if_p("cc.opi.ca_cert") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec
index d228465efc..31b6cb7d8b 100644
--- a/jobs/cloud_controller_ng/spec
+++ b/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:
@@ -1224,21 +1198,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
diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
index f0898a016a..a83f1c9bd9 100644
--- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
+++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
@@ -498,16 +498,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 +527,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") %>
diff --git a/jobs/cloud_controller_ng/templates/kubernetes_ca.crt.erb b/jobs/cloud_controller_ng/templates/kubernetes_ca.crt.erb
deleted file mode 100644
index ec56aedb79..0000000000
--- a/jobs/cloud_controller_ng/templates/kubernetes_ca.crt.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= p("cc.kubernetes.ca", '') %>
diff --git a/jobs/cloud_controller_ng/templates/opi_tls.crt.erb b/jobs/cloud_controller_ng/templates/opi_tls.crt.erb
deleted file mode 100644
index 44ebb8124d..0000000000
--- a/jobs/cloud_controller_ng/templates/opi_tls.crt.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% if_p("cc.opi.client_cert") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_ng/templates/opi_tls.key.erb b/jobs/cloud_controller_ng/templates/opi_tls.key.erb
deleted file mode 100644
index e4f7207bca..0000000000
--- a/jobs/cloud_controller_ng/templates/opi_tls.key.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% if_p("cc.opi.client_key") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_ng/templates/opi_tls_ca.crt.erb b/jobs/cloud_controller_ng/templates/opi_tls_ca.crt.erb
deleted file mode 100644
index 5b97fd0357..0000000000
--- a/jobs/cloud_controller_ng/templates/opi_tls_ca.crt.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% if_p("cc.opi.ca_cert") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec
index a9f53f4fe8..abbeedc575 100644
--- a/jobs/cloud_controller_worker/spec
+++ b/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
diff --git a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
index 2fde641476..25886a5236 100644
--- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
+++ b/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" %>
diff --git a/jobs/cloud_controller_worker/templates/opi_tls.crt.erb b/jobs/cloud_controller_worker/templates/opi_tls.crt.erb
deleted file mode 100644
index 9504c130ee..0000000000
--- a/jobs/cloud_controller_worker/templates/opi_tls.crt.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% link("cloud_controller_internal").if_p("cc.opi.client_cert") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_worker/templates/opi_tls.key.erb b/jobs/cloud_controller_worker/templates/opi_tls.key.erb
deleted file mode 100644
index ef9bf464e2..0000000000
--- a/jobs/cloud_controller_worker/templates/opi_tls.key.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% link("cloud_controller_internal").if_p("cc.opi.client_key") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/jobs/cloud_controller_worker/templates/opi_tls_ca.crt.erb b/jobs/cloud_controller_worker/templates/opi_tls_ca.crt.erb
deleted file mode 100644
index cc5a294c7e..0000000000
--- a/jobs/cloud_controller_worker/templates/opi_tls_ca.crt.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% link("cloud_controller_internal").if_p("cc.opi.ca_cert") do |certificate| %>
-<%= certificate %>
-<% end %>
diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb
index 50f76a3248..8f149b971d 100644
--- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb
+++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb
@@ -65,12 +65,6 @@ module Test
               'uaa' => {
                 'client_timeout' => 10
               },
-              'opi' => {
-                'url' => '',
-                'opi_staging' => '',
-                'enabled' => false
-
-              },
               'database_encryption' => {
                 'experimental_pbkdf2_hmac_iterations' => 123,
                 'skip_validation' => false,

From 4ecd7f8d7e64a3baf3b83e6e7a6329e64acb5573 Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Wed, 19 Jul 2023 18:03:43 +0000
Subject: [PATCH 03/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  M. Oleske:
     Remove kubernetes (#3140)
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index 9b783b0126..640009b846 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit 9b783b01266ff909035bb9824ad06729703e084d
+Subproject commit 640009b846362fbd443e79ad559700a9e1999846

From fb50097a623b32c61c0fb3a75bc4cc0f534e42ba Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Mon, 24 Jul 2023 16:29:49 +0000
Subject: [PATCH 04/13] Bump src/code.cloudfoundry.org/cc-uploader,
 src/code.cloudfoundry.org/tps

Bump src/code.cloudfoundry.org/cc-uploader
  dependabot[bot]:
     Bump github.com/onsi/gomega from 1.27.8 to 1.27.9 (#15)
Bump src/code.cloudfoundry.org/tps
  dependabot[bot]:
     Bump github.com/onsi/gomega from 1.27.8 to 1.27.9 (#31)
---
 src/code.cloudfoundry.org/cc-uploader | 2 +-
 src/code.cloudfoundry.org/tps         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/code.cloudfoundry.org/cc-uploader b/src/code.cloudfoundry.org/cc-uploader
index e1af3eb4cf..df1e30b2d2 160000
--- a/src/code.cloudfoundry.org/cc-uploader
+++ b/src/code.cloudfoundry.org/cc-uploader
@@ -1 +1 @@
-Subproject commit e1af3eb4cfd73738d3398d3cb1ab00b16df6a6be
+Subproject commit df1e30b2d27130ffe7801d4b3df82fe6fd8ce7f7
diff --git a/src/code.cloudfoundry.org/tps b/src/code.cloudfoundry.org/tps
index b60c3cff2a..92fe88a68d 160000
--- a/src/code.cloudfoundry.org/tps
+++ b/src/code.cloudfoundry.org/tps
@@ -1 +1 @@
-Subproject commit b60c3cff2a77838b0c2a030238de29b82d381020
+Subproject commit 92fe88a68d50b5b846e86788cf39606aff8c831e

From d02c0157272d81ac24c5e68f920e7025fb0c1f6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:35:37 +0000
Subject: [PATCH 05/13] Build(deps-dev): Bump rubocop from 1.54.2 to 1.55.0 in
 /spec

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.54.2 to 1.55.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.54.2...v1.55.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 spec/Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/Gemfile.lock b/spec/Gemfile.lock
index 53914b3144..1e941bf046 100644
--- a/spec/Gemfile.lock
+++ b/spec/Gemfile.lock
@@ -28,7 +28,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.54.2)
+    rubocop (1.55.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -36,7 +36,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)

From 0821a29f07db304bc13f2326af5e987391003e14 Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Wed, 26 Jul 2023 13:32:20 +0000
Subject: [PATCH 06/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  Philipp Thun:
     Merge pull request #3360 from cloudfoundry/dependabot/bundler/rubocop-1.55.0
  dependabot[bot]:
     build(deps-dev): bump rubocop from 1.54.2 to 1.55.0
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index 640009b846..ce4cdc8b91 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit 640009b846362fbd443e79ad559700a9e1999846
+Subproject commit ce4cdc8b914c45474a2f88e93b8daf4c490c034c

From 4a8ea13db6464f24812dd53e38258ee21c000c6c Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Wed, 26 Jul 2023 22:28:23 +0000
Subject: [PATCH 07/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  Seth Boyles:
     Remove v3/docs from dependabot config (#3350)
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index ce4cdc8b91..bcaa594e03 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit ce4cdc8b914c45474a2f88e93b8daf4c490c034c
+Subproject commit bcaa594e03a72fe89fab183aa28ef9f68221f860

From 110e280f2ec837840afbc0b86fa0acf56ef8e81c Mon Sep 17 00:00:00 2001
From: johha <johannes.haass@sap.com>
Date: Thu, 27 Jul 2023 12:28:52 +0200
Subject: [PATCH 08/13] Add optional cc `max_total_results` parameter

Related to https://github.com/cloudfoundry/cloud_controller_ng/pull/3353
---
 jobs/cloud_controller_ng/spec                   |  2 ++
 .../templates/cloud_controller_ng.yml.erb       |  3 +++
 .../cloud_controller_ng_spec.rb                 | 17 +++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec
index 31b6cb7d8b..3bf831ade5 100644
--- a/jobs/cloud_controller_ng/spec
+++ b/jobs/cloud_controller_ng/spec
@@ -916,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"
diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
index a83f1c9bd9..f2fed2952c 100644
--- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
+++ b/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"
diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb
index 1afd57d0c2..187eb9db97 100644
--- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb
+++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb
@@ -624,6 +624,23 @@ module Test
               end
             end
           end
+
+          describe  'max_total_results' do
+            context "when 'cc.renderer.max_total_results' is set" do
+              it 'renders max_total_results into the ccng config' do
+                merged_manifest_properties['cc'].store('renderer', { 'max_total_results' => 1000 })
+                template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
+                expect(template_hash['renderer']['max_total_results']).to eq(1000)
+              end
+            end
+
+            context "when 'cc.renderer.max_total_results' is not set (default)" do
+              it 'does not render max_total_results into the ccng config' do
+                template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
+                expect(template_hash['renderer']).not_to have_key(:max_total_results)
+              end
+            end
+          end
         end
       end
     end

From 3ea855d256af62aa461171e9da05844157b9779f Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Thu, 27 Jul 2023 11:31:36 +0000
Subject: [PATCH 09/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  Philipp Thun:
     Add delayed_jobs_reserve_where index
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index bcaa594e03..bee7a8ae62 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit bcaa594e03a72fe89fab183aa28ef9f68221f860
+Subproject commit bee7a8ae62b43a3656b30cf65459f4a5fe663985

From b419daaa39d439e01521f6c665a385cd2131a64b Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Thu, 27 Jul 2023 12:28:33 +0000
Subject: [PATCH 10/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  Florian Braun:
     Limit max pagination depth (#3353)
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index bee7a8ae62..f47b8ebaaa 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit bee7a8ae62b43a3656b30cf65459f4a5fe663985
+Subproject commit f47b8ebaaa81904d8e03ff92b978afa73815561c

From 2283b1a4e86059c586a63be6ee61fd2444e5d345 Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Fri, 28 Jul 2023 08:17:29 +0000
Subject: [PATCH 11/13] Create final release 1.156.0

---
 .../jobs/cc_deployment_updater/index.yml      |   4 +
 .../jobs/cloud_controller_clock/index.yml     |   4 +
 .../jobs/cloud_controller_ng/index.yml        |   4 +
 .../jobs/cloud_controller_worker/index.yml    |   4 +
 .final_builds/packages/cc_uploader/index.yml  |   4 +
 .../packages/cloud_controller_ng/index.yml    |   4 +
 .final_builds/packages/tps/index.yml          |   4 +
 releases/capi/capi-1.156.0.yml                | 193 ++++++++++++++++++
 releases/capi/index.yml                       |   2 +
 9 files changed, 223 insertions(+)
 create mode 100644 releases/capi/capi-1.156.0.yml

diff --git a/.final_builds/jobs/cc_deployment_updater/index.yml b/.final_builds/jobs/cc_deployment_updater/index.yml
index 079398e218..26a85f7ce0 100644
--- a/.final_builds/jobs/cc_deployment_updater/index.yml
+++ b/.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
diff --git a/.final_builds/jobs/cloud_controller_clock/index.yml b/.final_builds/jobs/cloud_controller_clock/index.yml
index 02978311f6..bd2eacc57b 100644
--- a/.final_builds/jobs/cloud_controller_clock/index.yml
+++ b/.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
diff --git a/.final_builds/jobs/cloud_controller_ng/index.yml b/.final_builds/jobs/cloud_controller_ng/index.yml
index 2c0a5099a1..690286e317 100644
--- a/.final_builds/jobs/cloud_controller_ng/index.yml
+++ b/.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
diff --git a/.final_builds/jobs/cloud_controller_worker/index.yml b/.final_builds/jobs/cloud_controller_worker/index.yml
index 027234dc18..6d22678088 100644
--- a/.final_builds/jobs/cloud_controller_worker/index.yml
+++ b/.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
diff --git a/.final_builds/packages/cc_uploader/index.yml b/.final_builds/packages/cc_uploader/index.yml
index 4e0d04f697..d1403938ab 100644
--- a/.final_builds/packages/cc_uploader/index.yml
+++ b/.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
diff --git a/.final_builds/packages/cloud_controller_ng/index.yml b/.final_builds/packages/cloud_controller_ng/index.yml
index 13b9c44ae9..b0e4f2796e 100644
--- a/.final_builds/packages/cloud_controller_ng/index.yml
+++ b/.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
diff --git a/.final_builds/packages/tps/index.yml b/.final_builds/packages/tps/index.yml
index b8abe0456f..b8336d8d5b 100644
--- a/.final_builds/packages/tps/index.yml
+++ b/.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
diff --git a/releases/capi/capi-1.156.0.yml b/releases/capi/capi-1.156.0.yml
new file mode 100644
index 0000000000..1d50ec6eb3
--- /dev/null
+++ b/releases/capi/capi-1.156.0.yml
@@ -0,0 +1,193 @@
+name: capi
+version: 1.156.0
+commit_hash: a9f053fe
+uncommitted_changes: false
+jobs:
+- name: bbr-cloudcontrollerdb
+  version: 5b50120465eafdc8092a021c20c2464386dd44a7c48784516da10280cf674860
+  fingerprint: 5b50120465eafdc8092a021c20c2464386dd44a7c48784516da10280cf674860
+  sha1: sha256:9b6d5f5c49cf3142e076ea88c49c9dcb9db468f2ecd7f3ff7553afe0b6f8597a
+  packages: []
+- name: blobstore
+  version: 1e1553d575e0c6f97783e7f32f6dfa573981f48cc02f9de1d35f331b8ce27dba
+  fingerprint: 1e1553d575e0c6f97783e7f32f6dfa573981f48cc02f9de1d35f331b8ce27dba
+  sha1: sha256:7514ed197ccbbe6fd4a8360a728ab9d0bc1ed781f0dc05c7f436591fbe83c393
+  packages:
+  - nginx_webdav
+  - blobstore_url_signer
+  - capi_utils
+- name: cc_deployment_updater
+  version: 08aba220a7fbdace8ddc904f673d1fb2822bd10a629eca8a3679463574adbd7e
+  fingerprint: 08aba220a7fbdace8ddc904f673d1fb2822bd10a629eca8a3679463574adbd7e
+  sha1: sha256:681fb29bbc9ac5ca6299b754c346d1dfdf7ba807c9d35e253c4d1c35b66ffb7f
+  packages:
+  - capi_utils
+  - cloud_controller_ng
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: cc_route_syncer
+  version: b02980156c91f4a5160496077bbe8263e7d7b2d0aca80740d6c22063ebb5e603
+  fingerprint: b02980156c91f4a5160496077bbe8263e7d7b2d0aca80740d6c22063ebb5e603
+  sha1: sha256:2ca24367b3ebe06141017280942fd6e40da45d0a8aad2b98c65e4ff1cf1757c5
+  packages:
+  - capi_utils
+  - cloud_controller_ng
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: cc_uploader
+  version: 65f17d2ae2524e353708ee58b0eca06a99366b4e38cf39eff54bafcf2d8b6d56
+  fingerprint: 65f17d2ae2524e353708ee58b0eca06a99366b4e38cf39eff54bafcf2d8b6d56
+  sha1: sha256:ae3183df7d04cb73c8dca849d1e4242062a384f20d4b54d69ded7f92c5aa30e0
+  packages:
+  - capi_utils
+  - cc_uploader
+- name: cloud_controller_clock
+  version: 2d515f85bcdc9497251c0bd45ae3e0fa3170714cd391d7c76a9b19cd3a3c8b20
+  fingerprint: 2d515f85bcdc9497251c0bd45ae3e0fa3170714cd391d7c76a9b19cd3a3c8b20
+  sha1: sha256:b638d7ec95cc14a4530de7ec5e3a30b8d600c6f8bcb01c18f037f883991fd8ce
+  packages:
+  - capi_utils
+  - cloud_controller_ng
+  - nginx
+  - nginx_newrelic_plugin
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: cloud_controller_ng
+  version: 66ef87dae673d9e9c7fea469f952cd78e557780b388bc6a55802dc138df80ef5
+  fingerprint: 66ef87dae673d9e9c7fea469f952cd78e557780b388bc6a55802dc138df80ef5
+  sha1: sha256:92555af60754dba8d61ae0e8777cabb5857c05771e2e7de0fbd9172c55be3ab0
+  packages:
+  - capi_utils
+  - cloud_controller_ng
+  - nginx
+  - nginx_newrelic_plugin
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: cloud_controller_worker
+  version: a4688ac4fdba47c1f55d28abc01dcbaf67035e61308913591a696699d5d1ca99
+  fingerprint: a4688ac4fdba47c1f55d28abc01dcbaf67035e61308913591a696699d5d1ca99
+  sha1: sha256:11795fb6b8f04acd703fe509fc1d486a8d0cf01c033ffa0f3da8f40e573e0141
+  packages:
+  - capi_utils
+  - cloud_controller_ng
+  - nginx
+  - nginx_newrelic_plugin
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: nfs_mounter
+  version: f729f7deb21945c13cabe85599f3c62b5bc3c907f733d0cbf8833b0b770e50d0
+  fingerprint: f729f7deb21945c13cabe85599f3c62b5bc3c907f733d0cbf8833b0b770e50d0
+  sha1: sha256:49699657ba1a458b43f25aad832e7d6c5fad28ec6dca276feb43d2a856174f82
+  packages:
+  - nfs-debs
+  - capi_utils
+- name: redis
+  version: ad7179816133efd515e3b29dc2a10b8252d7427c26ebc42b932e24d8f2966157
+  fingerprint: ad7179816133efd515e3b29dc2a10b8252d7427c26ebc42b932e24d8f2966157
+  sha1: sha256:b83a5cb128b53411388adeadaa66c39e808704a53914118a8a4704935094ac5b
+  packages:
+  - redis
+- name: rotate_cc_database_key
+  version: 55a54cbd2958c4639eb020649fb74c633363959f49b905303d121f765c303ff1
+  fingerprint: 55a54cbd2958c4639eb020649fb74c633363959f49b905303d121f765c303ff1
+  sha1: sha256:38859fbdfd50d73febb5e6eddd38a94c0453fe5622c1954d9012ae65a0296a4a
+  packages:
+  - capi_utils
+  - cloud_controller_ng
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: tps
+  version: 95b2d9abfe40d8eabf134b4503f3ea15a08ccbdf7d1195b869ad0edb6bd6d9c6
+  fingerprint: 95b2d9abfe40d8eabf134b4503f3ea15a08ccbdf7d1195b869ad0edb6bd6d9c6
+  sha1: sha256:b9aa564c5890eadaa8b119857c3f1b2a331aedaaf1047b4f9117284ce55038a0
+  packages:
+  - capi_utils
+  - tps
+packages:
+- name: blobstore_url_signer
+  version: 968720cfdf5220f645e45b0520a928f04e83b3b2c476454546e46b6783472378
+  fingerprint: 968720cfdf5220f645e45b0520a928f04e83b3b2c476454546e46b6783472378
+  sha1: sha256:7bccc7a19f7135308c547aa9f449d7cd8047da3db1a6d51865b96d701b25d041
+  dependencies:
+  - golang-1-linux
+- name: capi_utils
+  version: f4000393130c25ccb0c17585dcc370900a0fe9eca2beab16966e39acab5f9ccb
+  fingerprint: f4000393130c25ccb0c17585dcc370900a0fe9eca2beab16966e39acab5f9ccb
+  sha1: sha256:b28cba2a6d23b1cac7048f335bb1062aad9f54c70263121e788dcaa02762cd63
+  dependencies: []
+- name: cc_uploader
+  version: a02c71ad55405c4c4a723b3854a908d202fa999587ff49463e651c296f484f19
+  fingerprint: a02c71ad55405c4c4a723b3854a908d202fa999587ff49463e651c296f484f19
+  sha1: sha256:4442e04ef968b01a105d47fbc7432fba9700033ad3ce98ade87ce71d3e4c49d3
+  dependencies:
+  - golang-1-linux
+- name: cloud_controller_ng
+  version: d64f470044f56028af4c09b5ba12a288288df1a33fc8e8660bc1755665efdd2a
+  fingerprint: d64f470044f56028af4c09b5ba12a288288df1a33fc8e8660bc1755665efdd2a
+  sha1: sha256:98f4d077240ed39150a0837901151690d84ff07629cf92fc149bce850d1df45e
+  dependencies:
+  - libpq
+  - mariadb_connector_c
+  - ruby-3.2
+- name: golang-1-linux
+  version: b09468ac73cd3350333a35eb09c980c6a06c5465be0e1ba430da62757dc10a04
+  fingerprint: b09468ac73cd3350333a35eb09c980c6a06c5465be0e1ba430da62757dc10a04
+  sha1: sha256:ea461525fb19ffd4c2753f98e3d740d426ed19872c4b1700413ae8100954a22a
+  dependencies: []
+- name: libpq
+  version: 31df0f461075bba3676cfd2be49eec229e06f56f350ddd7f6899f98246029a6b
+  fingerprint: 31df0f461075bba3676cfd2be49eec229e06f56f350ddd7f6899f98246029a6b
+  sha1: sha256:0054bd6f2f4be99ea35b50a76573ba79def5738ceff0f02e74a174c68a67f5e7
+  dependencies: []
+- name: mariadb_connector_c
+  version: 0b672947d383ba41acc3ea02c3639d188abd2952a8d249038f1681465f1198a4
+  fingerprint: 0b672947d383ba41acc3ea02c3639d188abd2952a8d249038f1681465f1198a4
+  sha1: sha256:1c62c8e6f1debacb17bf05879f63a65d6b9b3f35efcf828f3da299cfd6d9d65e
+  dependencies: []
+- name: nfs-debs
+  version: 358e469edd68f283e533264b29c249be62d92d7b2a154d974adb1ec1f650aeb5
+  fingerprint: 358e469edd68f283e533264b29c249be62d92d7b2a154d974adb1ec1f650aeb5
+  sha1: sha256:fdf2f613e07f16285890c4e6744f5193f9f64c650f31ac0a4c8d291d69e67e92
+  dependencies: []
+- name: nginx
+  version: 3309d5b728a35df53754db14ac63b9b3b185047e4faa162a694e7343478996e3
+  fingerprint: 3309d5b728a35df53754db14ac63b9b3b185047e4faa162a694e7343478996e3
+  sha1: sha256:0412c15f45964621abce80c096e03c7757b449c53770508c181ceaaa2c5916b4
+  dependencies: []
+- name: nginx_newrelic_plugin
+  version: 522494192a020ff906224b54ccbd33cf364ca7f56e6053aacca381a573aa9c79
+  fingerprint: 522494192a020ff906224b54ccbd33cf364ca7f56e6053aacca381a573aa9c79
+  sha1: sha256:453efe0a7b5ecb4101b96015e5f67b80eaa09dd6255c445916911d5e7f5d1cd8
+  dependencies:
+  - ruby-3.2
+- name: nginx_webdav
+  version: 5a0fe4a406fe782829f66598bfdfc088cbe833c925a30d9aab35d4391161e128
+  fingerprint: 5a0fe4a406fe782829f66598bfdfc088cbe833c925a30d9aab35d4391161e128
+  sha1: sha256:487f74644b4d6718df8bebf71ba1733d36184987d3aa5d51ac5f5b7f5df66d73
+  dependencies: []
+- name: redis
+  version: 8c256818dc8138876a518efaa853680ccd4f1ab93bec654e77b58300f430af05
+  fingerprint: 8c256818dc8138876a518efaa853680ccd4f1ab93bec654e77b58300f430af05
+  sha1: sha256:b923e5781942fab6c90e2ba0228de4bc73ad2a286256670b4d883165bed584ac
+  dependencies: []
+- name: ruby-3.2
+  version: 4f045ca4596cf0a251f2995f9edce04bce7c65367bce4764f9382e1a78026cab
+  fingerprint: 4f045ca4596cf0a251f2995f9edce04bce7c65367bce4764f9382e1a78026cab
+  sha1: sha256:10d66d9861285eadfe1b32b36471b1f39b3033a3be54789e3114b9b02f4b0eaa
+  dependencies: []
+- name: tps
+  version: e8737bb724e468e4dd1d426cc6814e86e31d911098d7decd8b7566bc8cce8716
+  fingerprint: e8737bb724e468e4dd1d426cc6814e86e31d911098d7decd8b7566bc8cce8716
+  sha1: sha256:70635453cadfd1575ab4ff174d05ee4825f10cd2564dc8a3ba8700eee3c4d074
+  dependencies:
+  - golang-1-linux
+license:
+  version: 47b97af07f8e50aee188250f38ed8b2fa9a7d4c9a0202982654c45c714550409
+  fingerprint: 47b97af07f8e50aee188250f38ed8b2fa9a7d4c9a0202982654c45c714550409
+  sha1: sha256:980318ef43a8e90c31feb053096e3fb92e7b53f6b45acf438701280b232ff6f6
diff --git a/releases/capi/index.yml b/releases/capi/index.yml
index 558ccba622..da5d37ef9f 100644
--- a/releases/capi/index.yml
+++ b/releases/capi/index.yml
@@ -33,6 +33,8 @@ builds:
     version: 1.17.0
   20b55e20-6240-4460-4da0-a6fbe8bd7620:
     version: 1.38.0
+  2152df4b-4c49-4333-4b6d-99e75a0b1ada:
+    version: 1.156.0
   236e658f-9b16-4da1-8f95-d03130a2b5df:
     version: 1.5.0
   249e04de-9bb9-462c-8c59-881b22600ca7:

From 05cd430133d0881628096d4edae8f2e530b1123f Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Fri, 28 Jul 2023 08:36:59 +0000
Subject: [PATCH 12/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  CAPI CI:
     bump to 2.208.0
     bump to 3.143.0
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index f47b8ebaaa..c9833c9f63 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit f47b8ebaaa81904d8e03ff92b978afa73815561c
+Subproject commit c9833c9f63a862347e952648c8c86963a5eee8e1

From 7df7bf0eb27a89ed3bca72c476781324b98bc012 Mon Sep 17 00:00:00 2001
From: CAPI CI <cf-capi-eng+ci@pivotal.io>
Date: Fri, 28 Jul 2023 08:37:29 +0000
Subject: [PATCH 13/13] Bump src/cloud_controller_ng

Bump src/cloud_controller_ng
  CAPI CI:
     Bump v2 API docs version 2.208.0
     bump to 2.208.0
     bump to 3.143.0
---
 src/cloud_controller_ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cloud_controller_ng b/src/cloud_controller_ng
index c9833c9f63..d0eb060270 160000
--- a/src/cloud_controller_ng
+++ b/src/cloud_controller_ng
@@ -1 +1 @@
-Subproject commit c9833c9f63a862347e952648c8c86963a5eee8e1
+Subproject commit d0eb06027023f35af907149e7e68648b9f736536