From e7231e01dc69fb35cd209dee915e8cd8b385fa59 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 20:41:59 +0200 Subject: [PATCH 01/35] Test service account worker configuration rendering (red) --- .../cloud_controller_worker_spec.rb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 7927ea28ab..c9229e6ec5 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -128,6 +128,30 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders dedicated provisioning credentials and instance trust only when explicitly enabled' do + manifest_properties['cc']['service_accounts'] = { + 'provisioning_enabled' => true, + 'runtime_enabled' => false, + 'management_client_id' => 'account-manager', + 'management_client_secret' => 'manager-secret', + 'identity_ca' => "-----BEGIN CERTIFICATE-----\nidentity-ca\n-----END CERTIFICATE-----", + 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_account_provisioning']).to eq( + 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', + 'identity_ca' => manifest_properties['cc']['service_accounts']['identity_ca'] + ) + expect(result['service_account_runtime_enabled']).to be(false) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') + end + + it 'keeps service account runtime and provisioning disabled by default' do + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_account_runtime_enabled']).to be(false) + expect(result).not_to have_key('service_account_provisioning') + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(manifest_properties, consumes: links)) From 84b18957aa445453a4d4e8735bb2d13db18e126a Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 20:42:48 +0200 Subject: [PATCH 02/35] Render dedicated service account worker trust and credentials --- jobs/cloud_controller_worker/spec | 19 ++++++++++++++++++- .../templates/cloud_controller_ng.yml.erb | 9 +++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 855d6743db..5771682bd7 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -68,6 +68,24 @@ consumes: optional: true properties: + cc.service_accounts.provisioning_enabled: + description: Enable dedicated managed service account client reconciliation in workers. + default: false + cc.service_accounts.runtime_enabled: + description: Enable typed account runtime identity only after all BBS/rep/cells support it. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint exposed to bound workloads. + default: "" + cc.service_accounts.management_client_id: + description: Dedicated UAA client with managed account namespace client-management permissions. + default: "" + cc.service_accounts.management_client_secret: + description: Secret of the dedicated UAA account-management client; never exposed to workloads. + default: "" + cc.service_accounts.identity_ca: + description: Instance identity CA PEM trusted for exact account DNS SAN authentication. + default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false @@ -599,4 +617,3 @@ properties: when applying manifests. If a service broker fails to complete a service binding request before the specified duration, the manifest job will fail." default: 60 - 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 01f66b3467..ef32fdd55d 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -167,6 +167,15 @@ uaa: client_timeout: <%= cc_internal.p("cc.uaa.client_timeout")%> <% end %> +service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> +service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> +<% if p('cc.service_accounts.provisioning_enabled') %> +service_account_provisioning: + client_id: <%= yaml_escape(p('cc.service_accounts.management_client_id')) %> + client_secret: <%= yaml_escape(p('cc.service_accounts.management_client_secret')) %> + identity_ca: <%= p('cc.service_accounts.identity_ca').to_json %> +<% end %> + # App staging parameters staging: timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %> From bd7d8831d6cba02871a55e06a5d9c6858267d237 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 20:43:46 +0200 Subject: [PATCH 03/35] Test service account API gate and discovery rendering (red) --- spec/cloud_controller_ng/cloud_controller_ng_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index b1d749ef75..9ee8975f4e 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -142,6 +142,18 @@ module Test describe 'config/cloud_controller_ng.yml' do let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders explicit service account gates and discovery without exposing management credentials' do + merged_manifest_properties['cc']['service_accounts'] = { + 'provisioning_enabled' => true, 'runtime_enabled' => true, + 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' + } + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_account_provisioning_enabled']).to be(true) + expect(result['service_account_runtime_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') + expect(result).not_to have_key('service_account_provisioning') + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) From 333cda02c4ed5c603909c724e53443e138049f31 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 20:44:26 +0200 Subject: [PATCH 04/35] Render default-off service account API and runtime gates --- jobs/cloud_controller_ng/spec | 9 +++++++++ .../templates/cloud_controller_ng.yml.erb | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index ba7e1b0d25..85d3c4c4b0 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -243,6 +243,15 @@ consumes: optional: true properties: + cc.service_accounts.provisioning_enabled: + description: Enable asynchronous service account client reconciliation requests. + default: false + cc.service_accounts.runtime_enabled: + description: Enable typed account runtime identity only after all BBS/rep/cells support it. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint for account discovery. + default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false 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 c7f69f1ca7..bfb0555b80 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -314,6 +314,10 @@ credential_references: interpolate_service_bindings: <%= p("cc.credential_references.interpolate_service_bindings") %> # App staging parameters +service_account_provisioning_enabled: <%= p('cc.service_accounts.provisioning_enabled') %> +service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> +service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> + staging: legacy_md5_buildpack_paths_enabled: <%= p("cc.legacy_md5_buildpack_paths_enabled") %> timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %> From ed47d22184a6f7f21d2be8f317229306b0057265 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 20:45:03 +0200 Subject: [PATCH 05/35] Test service account clock runtime rendering (red) --- spec/cloud_controller_clock/cloud_controller_clock_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/cloud_controller_clock/cloud_controller_clock_spec.rb b/spec/cloud_controller_clock/cloud_controller_clock_spec.rb index 12c9e24361..f3e6c0574d 100644 --- a/spec/cloud_controller_clock/cloud_controller_clock_spec.rb +++ b/spec/cloud_controller_clock/cloud_controller_clock_spec.rb @@ -118,6 +118,13 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders service account runtime discovery for clock-driven reconciliation' do + manifest_properties['cc']['service_accounts'] = { 'runtime_enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_account_runtime_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(manifest_properties, consumes: links)) From 7dbf40bb5a38ff7a254246037c7868053bb5a960 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 20:45:43 +0200 Subject: [PATCH 06/35] Render service account runtime discovery in clock config --- jobs/cloud_controller_clock/spec | 6 ++++++ .../templates/cloud_controller_ng.yml.erb | 3 +++ 2 files changed, 9 insertions(+) diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index b5745d9c8e..cf13475d2b 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -60,6 +60,12 @@ consumes: optional: true properties: + cc.service_accounts.runtime_enabled: + description: Enable typed account identity in clock reconciliation after runtime rollout. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint for account discovery. + default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false 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 650ef6a0b4..05153a299e 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -223,6 +223,9 @@ uaa: <% end %> # App staging parameters +service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> +service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> + staging: timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %> auth: From d2f5bb7ef679c99e3493ef44a56a6e0c5fe74987 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 5 Oct 2026 22:41:58 +0200 Subject: [PATCH 07/35] Bump cloud_controller_ng for space-owned service account POC --- 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 3a4f0bc491..8af06c4402 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 3a4f0bc49185f08feea8d8f9f5e821eb262f8968 +Subproject commit 8af06c44022e64b1b5b4e081234c807f2747a6a9 From fefb8c4bcb966e41348ae30f78345545d17c67c8 Mon Sep 17 00:00:00 2001 From: rkoster Date: Tue, 6 Oct 2026 07:10:05 +0200 Subject: [PATCH 08/35] Make packaged application directories readable by runtime user --- packages/cloud_controller_ng/packaging | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/cloud_controller_ng/packaging b/packages/cloud_controller_ng/packaging index 9344859f97..0d5b9b8a14 100644 --- a/packages/cloud_controller_ng/packaging +++ b/packages/cloud_controller_ng/packaging @@ -3,6 +3,9 @@ set -e -x # shellcheck disable=1090 source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-4.0/bosh/compile.env" cp -a * ${BOSH_INSTALL_TARGET} +# Archive-created parent directories may inherit a private build umask. +# The application is read by the unprivileged vcap runtime user. +chmod -R a+rX "${BOSH_INSTALL_TARGET}/cloud_controller_ng" cd ${BOSH_INSTALL_TARGET}/cloud_controller_ng mariadb_dir=/var/vcap/packages/mariadb_connector_c From 9fa307b81fc1d5d8eb8d1b07f70d3318b6e3f970 Mon Sep 17 00:00:00 2001 From: rkoster Date: Tue, 6 Oct 2026 07:22:09 +0200 Subject: [PATCH 09/35] Bump cloud_controller_ng for MySQL service account migration recovery --- 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 8af06c4402..e4fdc2b67e 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 8af06c44022e64b1b5b4e081234c807f2747a6a9 +Subproject commit e4fdc2b67ee2b15a927cb9ea5f75a653f615191b From ca65001417c34285c1394b4c2b6b2679c014b5b2 Mon Sep 17 00:00:00 2001 From: rkoster Date: Tue, 6 Oct 2026 08:25:09 +0200 Subject: [PATCH 10/35] Bump cloud_controller_ng for normalized UAA client reconciliation --- 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 e4fdc2b67e..8a4e504ae5 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit e4fdc2b67ee2b15a927cb9ea5f75a653f615191b +Subproject commit 8a4e504ae54b3b90753ebeedb0215a0c553c3ad1 From fbd0c3ed3fcad4e8fbd25388227f453bed4d77c7 Mon Sep 17 00:00:00 2001 From: rkoster Date: Wed, 7 Oct 2026 09:40:18 +0200 Subject: [PATCH 11/35] Test configurable service account creation budget rendering (red) --- spec/cloud_controller_ng/cloud_controller_ng_spec.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 9ee8975f4e..24739efa13 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -142,6 +142,17 @@ module Test describe 'config/cloud_controller_ng.yml' do let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders an unlimited service account creation budget by default' do + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_account_creation_limit']).to eq(-1) + end + + it 'renders the foundation-wide non-admin service account creation budget' do + merged_manifest_properties['cc']['service_accounts'] = { 'creation_limit' => 25 } + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_account_creation_limit']).to eq(25) + end + it 'renders explicit service account gates and discovery without exposing management credentials' do merged_manifest_properties['cc']['service_accounts'] = { 'provisioning_enabled' => true, 'runtime_enabled' => true, From e2a5bce25aa68d60820d3b4bd6649f4fdad0ace0 Mon Sep 17 00:00:00 2001 From: rkoster Date: Wed, 7 Oct 2026 09:40:57 +0200 Subject: [PATCH 12/35] Render configurable weekly service account creation limit --- jobs/cloud_controller_ng/spec | 3 +++ jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb | 1 + 2 files changed, 4 insertions(+) diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 85d3c4c4b0..5adc48970d 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -243,6 +243,9 @@ consumes: optional: true properties: + cc.service_accounts.creation_limit: + description: Foundation-wide maximum successful service account creations per non-admin authenticated principal over a rolling seven-day window. Platform admins are exempt; -1 means unlimited and 0 prevents non-admin creation. Deletion does not refund budget. + default: -1 cc.service_accounts.provisioning_enabled: description: Enable asynchronous service account client reconciliation requests. default: false 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 bfb0555b80..167d139942 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -315,6 +315,7 @@ credential_references: # App staging parameters service_account_provisioning_enabled: <%= p('cc.service_accounts.provisioning_enabled') %> +service_account_creation_limit: <%= p('cc.service_accounts.creation_limit') %> service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> From a186d2d41732ffcee9c4736750117d431e9e7612 Mon Sep 17 00:00:00 2001 From: rkoster Date: Wed, 7 Oct 2026 09:43:00 +0200 Subject: [PATCH 13/35] Bump cloud_controller_ng for creation budget and recursive account cleanup --- 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 8a4e504ae5..ec582b703e 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 8a4e504ae54b3b90753ebeedb0215a0c553c3ad1 +Subproject commit ec582b703ef80fa9b9c5b3c34ca2798a29b4b801 From 5089b31e445b32283a9306f45d8a9670dcc2ee8b Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:03:48 +0200 Subject: [PATCH 14/35] Test rendering service account trust bundle reference for workers (red) --- .../cloud_controller_worker_spec.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index c9229e6ec5..585e673478 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -146,6 +146,29 @@ module Test expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') end + it 'renders a UAA trust bundle reference instead of inline instance trust' do + manifest_properties['cc']['service_accounts'] = { + 'provisioning_enabled' => true, + 'management_client_id' => 'account-manager', + 'management_client_secret' => 'manager-secret', + 'identity_ca_ref' => 'diego-instance-identity' + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_account_provisioning']).to eq( + 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', + 'identity_ca_ref' => 'diego-instance-identity' + ) + end + + it 'refuses to render both inline instance trust and a trust bundle reference' do + manifest_properties['cc']['service_accounts'] = { + 'provisioning_enabled' => true, + 'identity_ca' => "-----BEGIN CERTIFICATE-----\nidentity-ca\n-----END CERTIFICATE-----", + 'identity_ca_ref' => 'diego-instance-identity' + } + expect { template.render(manifest_properties, consumes: links) }.to raise_error(/exactly one of cc.service_accounts.identity_ca or identity_ca_ref/) + end + it 'keeps service account runtime and provisioning disabled by default' do result = YAML.safe_load(template.render(manifest_properties, consumes: links)) expect(result['service_account_runtime_enabled']).to be(false) From 90d4e4bf67c72e9859057d0dda3274873f2f71d7 Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:04:05 +0200 Subject: [PATCH 15/35] Render service account trust bundle reference for workers --- jobs/cloud_controller_worker/spec | 5 ++++- .../templates/cloud_controller_ng.yml.erb | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 5771682bd7..b243a392af 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -84,7 +84,10 @@ properties: description: Secret of the dedicated UAA account-management client; never exposed to workloads. default: "" cc.service_accounts.identity_ca: - description: Instance identity CA PEM trusted for exact account DNS SAN authentication. + description: Instance identity CA PEM trusted for exact account DNS SAN authentication. Mutually exclusive with identity_ca_ref. + default: "" + cc.service_accounts.identity_ca_ref: + description: Name of a UAA trust bundle (uaa.mtls.trust_bundles) containing the instance identity CA, registered on account clients instead of inline PEM so CA rotation is a UAA configuration change. Mutually exclusive with identity_ca. default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" 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 ef32fdd55d..c1e65596fa 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -170,10 +170,21 @@ uaa: service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> <% if p('cc.service_accounts.provisioning_enabled') %> +<% + identity_ca = p('cc.service_accounts.identity_ca') + identity_ca_ref = p('cc.service_accounts.identity_ca_ref') + if identity_ca.to_s.strip.empty? == identity_ca_ref.to_s.strip.empty? + raise 'Set exactly one of cc.service_accounts.identity_ca or identity_ca_ref' + end +%> service_account_provisioning: client_id: <%= yaml_escape(p('cc.service_accounts.management_client_id')) %> client_secret: <%= yaml_escape(p('cc.service_accounts.management_client_secret')) %> - identity_ca: <%= p('cc.service_accounts.identity_ca').to_json %> +<% if identity_ca_ref.to_s.strip.empty? %> + identity_ca: <%= identity_ca.to_json %> +<% else %> + identity_ca_ref: <%= identity_ca_ref.to_json %> +<% end %> <% end %> # App staging parameters From 7bc5fe1010d168a5a08be607ad9f702072b3e72c Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:04:06 +0200 Subject: [PATCH 16/35] Bump cloud_controller_ng for trust bundle references and owned trust drift --- 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 ec582b703e..249433196f 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit ec582b703ef80fa9b9c5b3c34ca2798a29b4b801 +Subproject commit 249433196fd6df870ade8d0c888c1f32b04ca603 From 42721a29fd77707c7b9fb843ec7c38053d5f9cd2 Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:25:52 +0200 Subject: [PATCH 17/35] Bump cloud_controller_ng for management client updates --- 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 249433196f..38ba2c904e 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 249433196fd6df870ade8d0c888c1f32b04ca603 +Subproject commit 38ba2c904e5789eafc794f3f49a93bc6b439bf99 From 6845b53aa63cb288e7966ddcdd4287b2f213d4ed Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:46:18 +0200 Subject: [PATCH 18/35] Test requiring a trust bundle reference for worker provisioning (red) --- .../cloud_controller_worker_spec.rb | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 585e673478..9263bddb05 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -134,39 +134,29 @@ module Test 'runtime_enabled' => false, 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', - 'identity_ca' => "-----BEGIN CERTIFICATE-----\nidentity-ca\n-----END CERTIFICATE-----", + 'identity_ca_ref' => 'diego-instance-identity', 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' } result = YAML.safe_load(template.render(manifest_properties, consumes: links)) expect(result['service_account_provisioning']).to eq( 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', - 'identity_ca' => manifest_properties['cc']['service_accounts']['identity_ca'] + 'identity_ca_ref' => 'diego-instance-identity' ) expect(result['service_account_runtime_enabled']).to be(false) expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') end - it 'renders a UAA trust bundle reference instead of inline instance trust' do + it 'refuses to render provisioning without a UAA trust bundle reference' do manifest_properties['cc']['service_accounts'] = { 'provisioning_enabled' => true, 'management_client_id' => 'account-manager', - 'management_client_secret' => 'manager-secret', - 'identity_ca_ref' => 'diego-instance-identity' + 'management_client_secret' => 'manager-secret' } - result = YAML.safe_load(template.render(manifest_properties, consumes: links)) - expect(result['service_account_provisioning']).to eq( - 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', - 'identity_ca_ref' => 'diego-instance-identity' - ) + expect { template.render(manifest_properties, consumes: links) }.to raise_error(/Set cc.service_accounts.identity_ca_ref/) end - it 'refuses to render both inline instance trust and a trust bundle reference' do - manifest_properties['cc']['service_accounts'] = { - 'provisioning_enabled' => true, - 'identity_ca' => "-----BEGIN CERTIFICATE-----\nidentity-ca\n-----END CERTIFICATE-----", - 'identity_ca_ref' => 'diego-instance-identity' - } - expect { template.render(manifest_properties, consumes: links) }.to raise_error(/exactly one of cc.service_accounts.identity_ca or identity_ca_ref/) + it 'no longer declares inline instance identity CA certificates' do + expect(YAML.safe_load(File.read(File.join(release_path, 'jobs/cloud_controller_worker/spec')))['properties']).not_to have_key('cc.service_accounts.identity_ca') end it 'keeps service account runtime and provisioning disabled by default' do From 1178b267ec5165769a2eff1a8f79b209c8cc95d9 Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:46:34 +0200 Subject: [PATCH 19/35] Require a UAA trust bundle reference for worker provisioning --- jobs/cloud_controller_worker/spec | 5 +---- .../templates/cloud_controller_ng.yml.erb | 9 +-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index b243a392af..18ba085042 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -83,11 +83,8 @@ properties: cc.service_accounts.management_client_secret: description: Secret of the dedicated UAA account-management client; never exposed to workloads. default: "" - cc.service_accounts.identity_ca: - description: Instance identity CA PEM trusted for exact account DNS SAN authentication. Mutually exclusive with identity_ca_ref. - default: "" cc.service_accounts.identity_ca_ref: - description: Name of a UAA trust bundle (uaa.mtls.trust_bundles) containing the instance identity CA, registered on account clients instead of inline PEM so CA rotation is a UAA configuration change. Mutually exclusive with identity_ca. + description: Required with provisioning. Name of a UAA trust bundle (uaa.mtls.trust_bundles) containing the instance identity CA, referenced by every account client. Rotate the CA by changing the bundle's contents in UAA; clients never change. default: "" ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" 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 c1e65596fa..120970b453 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -171,21 +171,14 @@ service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> <% if p('cc.service_accounts.provisioning_enabled') %> <% - identity_ca = p('cc.service_accounts.identity_ca') identity_ca_ref = p('cc.service_accounts.identity_ca_ref') - if identity_ca.to_s.strip.empty? == identity_ca_ref.to_s.strip.empty? - raise 'Set exactly one of cc.service_accounts.identity_ca or identity_ca_ref' - end + raise 'Set cc.service_accounts.identity_ca_ref to a UAA trust bundle name' if identity_ca_ref.to_s.strip.empty? %> service_account_provisioning: client_id: <%= yaml_escape(p('cc.service_accounts.management_client_id')) %> client_secret: <%= yaml_escape(p('cc.service_accounts.management_client_secret')) %> -<% if identity_ca_ref.to_s.strip.empty? %> - identity_ca: <%= identity_ca.to_json %> -<% else %> identity_ca_ref: <%= identity_ca_ref.to_json %> <% end %> -<% end %> # App staging parameters staging: From f267b9ea1bf0feb9f69fea74449640ec774d5fc6 Mon Sep 17 00:00:00 2001 From: rkoster Date: Fri, 16 Oct 2026 11:46:35 +0200 Subject: [PATCH 20/35] Bump cloud_controller_ng for reference-only account client trust --- 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 38ba2c904e..bbf68fabf8 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 38ba2c904e5789eafc794f3f49a93bc6b439bf99 +Subproject commit bbf68fabf84407f6014a554a3df37d57fc90dd5c From 5bf253ad6bbf1576094968a409f2dc0856f68349 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 9 Nov 2026 16:55:53 +0100 Subject: [PATCH 21/35] Test qualified service account rollout contract configuration (red) --- spec/cloud_controller_ng/cloud_controller_ng_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 24739efa13..6006247141 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -147,6 +147,13 @@ module Test expect(result['service_account_creation_limit']).to eq(-1) end + it 'renders qualified runtime and router contract gates' do + merged_manifest_properties['cc']['service_accounts'] = { 'runtime_contract_version' => 2, 'router_contract_version' => 2 } + result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) + expect(result['service_account_runtime_contract_version']).to eq(2) + expect(result['service_account_router_contract_version']).to eq(2) + end + it 'renders the foundation-wide non-admin service account creation budget' do merged_manifest_properties['cc']['service_accounts'] = { 'creation_limit' => 25 } result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) From 529111efbbea8afc8ef3a4342e1ebc33e76022d2 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 9 Nov 2026 16:57:01 +0100 Subject: [PATCH 22/35] Render explicit qualified account runtime and router contract gates --- jobs/cloud_controller_clock/spec | 3 +++ .../templates/cloud_controller_ng.yml.erb | 1 + jobs/cloud_controller_ng/spec | 6 ++++++ .../templates/cloud_controller_ng.yml.erb | 2 ++ jobs/cloud_controller_worker/spec | 3 +++ .../templates/cloud_controller_ng.yml.erb | 1 + 6 files changed, 16 insertions(+) diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index cf13475d2b..294472733e 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -60,6 +60,9 @@ consumes: optional: true properties: + cc.service_accounts.runtime_contract_version: + description: Set to 2 only after all cells support prefix-qualified service account identities. + default: 0 cc.service_accounts.runtime_enabled: description: Enable typed account identity in clock reconciliation after runtime rollout. default: false 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 05153a299e..17c28e6149 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -224,6 +224,7 @@ uaa: # App staging parameters service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> +service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> staging: diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 5adc48970d..3b02da9522 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -255,6 +255,12 @@ properties: cc.service_accounts.token_endpoint: description: HTTPS UAA certificate-authenticated token endpoint for account discovery. default: "" + cc.service_accounts.runtime_contract_version: + description: Set to 2 only after all cells support prefix-qualified service account identities. + default: 0 + cc.service_accounts.router_contract_version: + description: Set to 2 only after all routers enforce prefix-qualified service account rules. + default: 0 ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false 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 167d139942..5528c2099e 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -317,6 +317,8 @@ credential_references: service_account_provisioning_enabled: <%= p('cc.service_accounts.provisioning_enabled') %> service_account_creation_limit: <%= p('cc.service_accounts.creation_limit') %> service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> +service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> +service_account_router_contract_version: <%= p('cc.service_accounts.router_contract_version') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> staging: diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 18ba085042..58611e1135 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -68,6 +68,9 @@ consumes: optional: true properties: + cc.service_accounts.runtime_contract_version: + description: Set to 2 only after all cells support prefix-qualified service account identities. + default: 0 cc.service_accounts.provisioning_enabled: description: Enable dedicated managed service account client reconciliation in workers. default: false 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 120970b453..c310bb65fd 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -168,6 +168,7 @@ uaa: <% end %> service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> +service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> <% if p('cc.service_accounts.provisioning_enabled') %> <% From d68052fcda928c7313f570675e10af0d05566057 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 9 Nov 2026 16:57:38 +0100 Subject: [PATCH 23/35] Test worker named federation policy configuration (red) --- .../cloud_controller_worker_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 9263bddb05..06e995d01e 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -155,6 +155,16 @@ module Test expect { template.render(manifest_properties, consumes: links) }.to raise_error(/Set cc.service_accounts.identity_ca_ref/) end + it 'renders an optional named federation resource policy for the worker only' do + manifest_properties['cc']['service_accounts'] = { + 'provisioning_enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', + 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', + 'allowed_resources_ref' => 'cf-workload-federation' + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result.dig('service_account_provisioning', 'allowed_resources_ref')).to eq('cf-workload-federation') + end + it 'no longer declares inline instance identity CA certificates' do expect(YAML.safe_load(File.read(File.join(release_path, 'jobs/cloud_controller_worker/spec')))['properties']).not_to have_key('cc.service_accounts.identity_ca') end From 9bb5a713b3fb12dfb8c66e2dc1953868e015fed4 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 9 Nov 2026 16:58:09 +0100 Subject: [PATCH 24/35] Render optional named service account federation policy for workers --- jobs/cloud_controller_worker/spec | 3 +++ .../templates/cloud_controller_ng.yml.erb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 58611e1135..44b9662675 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -68,6 +68,9 @@ consumes: optional: true properties: + cc.service_accounts.allowed_resources_ref: + description: Optional named UAA federation resource policy. Requires UAA named-resource-policy support; leave unset until available. + default: "" cc.service_accounts.runtime_contract_version: description: Set to 2 only after all cells support prefix-qualified service account identities. default: 0 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 c310bb65fd..bd2ac95132 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -179,6 +179,9 @@ service_account_provisioning: client_id: <%= yaml_escape(p('cc.service_accounts.management_client_id')) %> client_secret: <%= yaml_escape(p('cc.service_accounts.management_client_secret')) %> identity_ca_ref: <%= identity_ca_ref.to_json %> +<% unless p('cc.service_accounts.allowed_resources_ref').empty? %> + allowed_resources_ref: <%= p('cc.service_accounts.allowed_resources_ref').to_json %> +<% end %> <% end %> # App staging parameters From d4be075d8584f86e5f90574b90998e48935c2126 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 9 Nov 2026 17:43:16 +0100 Subject: [PATCH 25/35] Bump cloud_controller_ng for org-owned service accounts and entitlement APIs --- 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 bbf68fabf8..134db0dc37 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit bbf68fabf84407f6014a554a3df37d57fc90dd5c +Subproject commit 134db0dc37ae87dc1e0cc6521e052eb15f8d920b From 39aded212e9b9651bea7f91fed0db3d3f76d0bd8 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 9 Nov 2026 17:47:30 +0100 Subject: [PATCH 26/35] Bump cloud_controller_ng for active entitlement source checks --- 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 134db0dc37..66e9f973ce 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 134db0dc37ae87dc1e0cc6521e052eb15f8d920b +Subproject commit 66e9f973ce1a7c5fa88e76cee87b01d9e9a1aeb9 From 6748aa453a4316999e0c7662295bddedb3c99a65 Mon Sep 17 00:00:00 2001 From: rkoster Date: Tue, 10 Nov 2026 08:28:35 +0100 Subject: [PATCH 27/35] Test no router contract version is declared or rendered (red) --- spec/cloud_controller_ng/cloud_controller_ng_spec.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 6006247141..ff16e47e13 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -147,11 +147,13 @@ module Test expect(result['service_account_creation_limit']).to eq(-1) end - it 'renders qualified runtime and router contract gates' do - merged_manifest_properties['cc']['service_accounts'] = { 'runtime_contract_version' => 2, 'router_contract_version' => 2 } + it 'renders the runtime gate without introducing a router contract property' do + merged_manifest_properties['cc']['service_accounts'] = { 'runtime_contract_version' => 2 } result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) expect(result['service_account_runtime_contract_version']).to eq(2) - expect(result['service_account_router_contract_version']).to eq(2) + expect(result).not_to have_key('service_account_router_contract_version') + properties = YAML.safe_load(File.read(File.join(release_path, 'jobs/cloud_controller_ng/spec')))['properties'] + expect(properties).not_to have_key('cc.service_accounts.router_contract_version') end it 'renders the foundation-wide non-admin service account creation budget' do From fe5ce0494b149de2cc6584be4c01d12f688f6e93 Mon Sep 17 00:00:00 2001 From: rkoster Date: Tue, 10 Nov 2026 08:29:18 +0100 Subject: [PATCH 28/35] Remove the extra service account router contract property --- jobs/cloud_controller_ng/spec | 3 --- jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb | 1 - 2 files changed, 4 deletions(-) diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 3b02da9522..b2a0b01577 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -258,9 +258,6 @@ properties: cc.service_accounts.runtime_contract_version: description: Set to 2 only after all cells support prefix-qualified service account identities. default: 0 - cc.service_accounts.router_contract_version: - description: Set to 2 only after all routers enforce prefix-qualified service account rules. - default: 0 ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false 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 5528c2099e..a781f95583 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -318,7 +318,6 @@ service_account_provisioning_enabled: <%= p('cc.service_accounts.provisioning_en service_account_creation_limit: <%= p('cc.service_accounts.creation_limit') %> service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> -service_account_router_contract_version: <%= p('cc.service_accounts.router_contract_version') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> staging: From 3d42b620bdf0f6cda506f070eae6032c7a72c6f8 Mon Sep 17 00:00:00 2001 From: rkoster Date: Tue, 10 Nov 2026 08:30:17 +0100 Subject: [PATCH 29/35] Bump cloud_controller_ng to remove router contract gating --- 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 66e9f973ce..c303938a1e 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 66e9f973ce1a7c5fa88e76cee87b01d9e9a1aeb9 +Subproject commit c303938a1e12b1f3dd32f2c5d098831d0b61c04d From 9598813d82c9bd50bc0456d395bf19ec00b1fc71 Mon Sep 17 00:00:00 2001 From: rkoster Date: Thu, 12 Nov 2026 19:28:42 +0100 Subject: [PATCH 30/35] Test single service account activation across CAPI jobs (red) --- .../cc_deployment_updater_spec.rb | 14 ++++++++++++++ .../cloud_controller_clock_spec.rb | 4 ++-- .../cloud_controller_ng_spec.rb | 12 ++++++------ .../cloud_controller_worker_spec.rb | 11 +++++------ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/spec/cc_deployment_updater/cc_deployment_updater_spec.rb b/spec/cc_deployment_updater/cc_deployment_updater_spec.rb index ad61a5820c..12bccecef1 100644 --- a/spec/cc_deployment_updater/cc_deployment_updater_spec.rb +++ b/spec/cc_deployment_updater/cc_deployment_updater_spec.rb @@ -160,6 +160,20 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } + it 'renders the shared service-account activation and discovery settings' do + manifest_properties['cc']['service_accounts'] = { 'enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/mtls/token' } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(true) + expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/mtls/token') + expect(result).not_to have_key('service_account_provisioning') + expect(result).not_to have_key('service_account_runtime_contract_version') + end + + it 'disables service accounts by default' do + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result['service_accounts_enabled']).to be(false) + end + it 'creates the cloud_controller_ng.yml config file' do expect do YAML.safe_load(template.render(manifest_properties, consumes: links)) diff --git a/spec/cloud_controller_clock/cloud_controller_clock_spec.rb b/spec/cloud_controller_clock/cloud_controller_clock_spec.rb index f3e6c0574d..9c52e580fa 100644 --- a/spec/cloud_controller_clock/cloud_controller_clock_spec.rb +++ b/spec/cloud_controller_clock/cloud_controller_clock_spec.rb @@ -119,9 +119,9 @@ module Test let(:template) { job.template('config/cloud_controller_ng.yml') } it 'renders service account runtime discovery for clock-driven reconciliation' do - manifest_properties['cc']['service_accounts'] = { 'runtime_enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' } + manifest_properties['cc']['service_accounts'] = { 'enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' } result = YAML.safe_load(template.render(manifest_properties, consumes: links)) - expect(result['service_account_runtime_enabled']).to be(true) + expect(result['service_accounts_enabled']).to be(true) expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') end diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index ff16e47e13..9285d54425 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -147,10 +147,11 @@ module Test expect(result['service_account_creation_limit']).to eq(-1) end - it 'renders the runtime gate without introducing a router contract property' do - merged_manifest_properties['cc']['service_accounts'] = { 'runtime_contract_version' => 2 } + it 'renders a single activation flag without contract versions' do + merged_manifest_properties['cc']['service_accounts'] = { 'enabled' => true } result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - expect(result['service_account_runtime_contract_version']).to eq(2) + expect(result['service_accounts_enabled']).to be(true) + expect(result).not_to have_key('service_account_runtime_contract_version') expect(result).not_to have_key('service_account_router_contract_version') properties = YAML.safe_load(File.read(File.join(release_path, 'jobs/cloud_controller_ng/spec')))['properties'] expect(properties).not_to have_key('cc.service_accounts.router_contract_version') @@ -164,12 +165,11 @@ module Test it 'renders explicit service account gates and discovery without exposing management credentials' do merged_manifest_properties['cc']['service_accounts'] = { - 'provisioning_enabled' => true, 'runtime_enabled' => true, + 'enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' } result = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - expect(result['service_account_provisioning_enabled']).to be(true) - expect(result['service_account_runtime_enabled']).to be(true) + expect(result['service_accounts_enabled']).to be(true) expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') expect(result).not_to have_key('service_account_provisioning') end diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 06e995d01e..081983eba2 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -130,8 +130,7 @@ module Test it 'renders dedicated provisioning credentials and instance trust only when explicitly enabled' do manifest_properties['cc']['service_accounts'] = { - 'provisioning_enabled' => true, - 'runtime_enabled' => false, + 'enabled' => true, 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', 'identity_ca_ref' => 'diego-instance-identity', @@ -142,13 +141,13 @@ module Test 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', 'identity_ca_ref' => 'diego-instance-identity' ) - expect(result['service_account_runtime_enabled']).to be(false) + expect(result['service_accounts_enabled']).to be(true) expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') end it 'refuses to render provisioning without a UAA trust bundle reference' do manifest_properties['cc']['service_accounts'] = { - 'provisioning_enabled' => true, + 'enabled' => true, 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret' } @@ -157,7 +156,7 @@ module Test it 'renders an optional named federation resource policy for the worker only' do manifest_properties['cc']['service_accounts'] = { - 'provisioning_enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', + 'enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', 'allowed_resources_ref' => 'cf-workload-federation' } @@ -171,7 +170,7 @@ module Test it 'keeps service account runtime and provisioning disabled by default' do result = YAML.safe_load(template.render(manifest_properties, consumes: links)) - expect(result['service_account_runtime_enabled']).to be(false) + expect(result['service_accounts_enabled']).to be(false) expect(result).not_to have_key('service_account_provisioning') end From d2f54a12e9b15c52d0ce7e954a564877b6a0dc78 Mon Sep 17 00:00:00 2001 From: rkoster Date: Thu, 12 Nov 2026 19:29:07 +0100 Subject: [PATCH 31/35] Render one service account enable property for all CAPI jobs --- jobs/cc_deployment_updater/spec | 7 ++++++- .../templates/cloud_controller_ng.yml.erb | 2 ++ jobs/cloud_controller_clock/spec | 7 ++----- .../templates/cloud_controller_ng.yml.erb | 3 +-- jobs/cloud_controller_ng/spec | 10 ++-------- .../templates/cloud_controller_ng.yml.erb | 4 +--- jobs/cloud_controller_worker/spec | 10 ++-------- .../templates/cloud_controller_ng.yml.erb | 5 ++--- 8 files changed, 18 insertions(+), 30 deletions(-) diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec index ae4c3152f3..35b3e730b2 100644 --- a/jobs/cc_deployment_updater/spec +++ b/jobs/cc_deployment_updater/spec @@ -58,6 +58,12 @@ consumes: optional: true properties: + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. + default: false + cc.service_accounts.token_endpoint: + description: HTTPS UAA certificate-authenticated token endpoint exposed to bound workloads. + default: "" ccdb.databases: description: "Contains the name of the database on the database server" ccdb.roles: @@ -267,4 +273,3 @@ properties: description: "PEM-encoded certificate for secure, mutually authenticated TLS communication with prom_scraper" cc.prom_scraper_tls.private_key: description: "PEM-encoded key for secure, mutually authenticated TLS communication with prom_scraper" - 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 b8211663b5..22d583dcfb 100644 --- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb +++ b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb @@ -20,6 +20,8 @@ %> --- +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> +service_account_token_endpoint: <%= p('cc.service_accounts.token_endpoint').to_json %> pid_filename: /var/vcap/sys/run/cc_deployment_updater/cc_deployment_updater.pid diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index 294472733e..a60104c9b5 100644 --- a/jobs/cloud_controller_clock/spec +++ b/jobs/cloud_controller_clock/spec @@ -60,11 +60,8 @@ consumes: optional: true properties: - cc.service_accounts.runtime_contract_version: - description: Set to 2 only after all cells support prefix-qualified service account identities. - default: 0 - cc.service_accounts.runtime_enabled: - description: Enable typed account identity in clock reconciliation after runtime rollout. + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. default: false cc.service_accounts.token_endpoint: description: HTTPS UAA certificate-authenticated token endpoint for account discovery. 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 17c28e6149..39755718d7 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -223,8 +223,7 @@ uaa: <% end %> # App staging parameters -service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> -service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> staging: diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index b2a0b01577..77d60a9254 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -246,18 +246,12 @@ properties: cc.service_accounts.creation_limit: description: Foundation-wide maximum successful service account creations per non-admin authenticated principal over a rolling seven-day window. Platform admins are exempt; -1 means unlimited and 0 prevents non-admin creation. Deletion does not refund budget. default: -1 - cc.service_accounts.provisioning_enabled: - description: Enable asynchronous service account client reconciliation requests. - default: false - cc.service_accounts.runtime_enabled: - description: Enable typed account runtime identity only after all BBS/rep/cells support it. + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. default: false cc.service_accounts.token_endpoint: description: HTTPS UAA certificate-authenticated token endpoint for account discovery. default: "" - cc.service_accounts.runtime_contract_version: - description: Set to 2 only after all cells support prefix-qualified service account identities. - default: 0 ssl.skip_cert_verify: description: "specifies that the job is allowed to skip ssl cert verification" default: false 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 a781f95583..8dd0011965 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -314,10 +314,8 @@ credential_references: interpolate_service_bindings: <%= p("cc.credential_references.interpolate_service_bindings") %> # App staging parameters -service_account_provisioning_enabled: <%= p('cc.service_accounts.provisioning_enabled') %> +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> service_account_creation_limit: <%= p('cc.service_accounts.creation_limit') %> -service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> -service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> staging: diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 44b9662675..d70a0cf84c 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -71,14 +71,8 @@ properties: cc.service_accounts.allowed_resources_ref: description: Optional named UAA federation resource policy. Requires UAA named-resource-policy support; leave unset until available. default: "" - cc.service_accounts.runtime_contract_version: - description: Set to 2 only after all cells support prefix-qualified service account identities. - default: 0 - cc.service_accounts.provisioning_enabled: - description: Enable dedicated managed service account client reconciliation in workers. - default: false - cc.service_accounts.runtime_enabled: - description: Enable typed account runtime identity only after all BBS/rep/cells support it. + cc.service_accounts.enabled: + description: Enable service account provisioning and runtime identity after compatible UAA, BBS, Diego and routing components are deployed. default: false cc.service_accounts.token_endpoint: description: HTTPS UAA certificate-authenticated token endpoint exposed to bound workloads. 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 bd2ac95132..106d648404 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -167,10 +167,9 @@ uaa: client_timeout: <%= cc_internal.p("cc.uaa.client_timeout")%> <% end %> -service_account_runtime_enabled: <%= p('cc.service_accounts.runtime_enabled') %> -service_account_runtime_contract_version: <%= p('cc.service_accounts.runtime_contract_version') %> +service_accounts_enabled: <%= p('cc.service_accounts.enabled') %> service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %> -<% if p('cc.service_accounts.provisioning_enabled') %> +<% if p('cc.service_accounts.enabled') %> <% identity_ca_ref = p('cc.service_accounts.identity_ca_ref') raise 'Set cc.service_accounts.identity_ca_ref to a UAA trust bundle name' if identity_ca_ref.to_s.strip.empty? From ea01619fa508c3df9645c9f9c63edb126e934840 Mon Sep 17 00:00:00 2001 From: rkoster Date: Thu, 12 Nov 2026 19:29:33 +0100 Subject: [PATCH 32/35] Bump cloud_controller_ng for review fixes and single account activation --- 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 c303938a1e..12534ae4a5 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit c303938a1e12b1f3dd32f2c5d098831d0b61c04d +Subproject commit 12534ae4a50874065e9230ba0fd4ff509ea2a209 From eaabd36a45e09099cab83fb2bfa39162fa674cee Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 16 Nov 2026 21:12:14 +0100 Subject: [PATCH 33/35] Test operator configured service account token validity (red) --- .../cloud_controller_worker_spec.rb | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index 081983eba2..f8fb477081 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -139,12 +139,31 @@ module Test result = YAML.safe_load(template.render(manifest_properties, consumes: links)) expect(result['service_account_provisioning']).to eq( 'client_id' => 'account-manager', 'client_secret' => 'manager-secret', - 'identity_ca_ref' => 'diego-instance-identity' + 'identity_ca_ref' => 'diego-instance-identity', 'token_validity_in_seconds' => 300 ) expect(result['service_accounts_enabled']).to be(true) expect(result['service_account_token_endpoint']).to eq('https://uaa.example.test/oauth/token/mtls') end + it 'renders operator token validity longer than the default' do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', + 'management_client_id' => 'account-manager', 'management_client_secret' => 'manager-secret', + 'token_validity_in_seconds' => 900 + } + result = YAML.safe_load(template.render(manifest_properties, consumes: links)) + expect(result.dig('service_account_provisioning', 'token_validity_in_seconds')).to eq(900) + end + + [0, -1, 1.5, '900'].each do |validity| + it "rejects invalid operator token validity #{validity.inspect}" do + manifest_properties['cc']['service_accounts'] = { + 'enabled' => true, 'identity_ca_ref' => 'diego-instance-identity', 'token_validity_in_seconds' => validity + } + expect { template.render(manifest_properties, consumes: links) }.to raise_error(/positive integer/) + end + end + it 'refuses to render provisioning without a UAA trust bundle reference' do manifest_properties['cc']['service_accounts'] = { 'enabled' => true, From 1c650e9fe95b2477deeddc2208458d6e4e81dfa6 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 16 Nov 2026 21:12:51 +0100 Subject: [PATCH 34/35] Expose service account token validity to platform operators --- jobs/cloud_controller_worker/spec | 3 +++ .../templates/cloud_controller_ng.yml.erb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index d70a0cf84c..3fc23a7e0a 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -68,6 +68,9 @@ consumes: optional: true properties: + cc.service_accounts.token_validity_in_seconds: + description: Positive managed service account access-token lifetime in seconds. Operators may select shorter or longer values; UAA must also cap issuance at the authenticating certificate expiry. Existing clients receive changes on their next provisioning or enable reconciliation; already issued tokens are unaffected. + default: 300 cc.service_accounts.allowed_resources_ref: description: Optional named UAA federation resource policy. Requires UAA named-resource-policy support; leave unset until available. default: "" 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 106d648404..560bee6a94 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -173,8 +173,11 @@ service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_end <% identity_ca_ref = p('cc.service_accounts.identity_ca_ref') raise 'Set cc.service_accounts.identity_ca_ref to a UAA trust bundle name' if identity_ca_ref.to_s.strip.empty? + token_validity = p('cc.service_accounts.token_validity_in_seconds') + raise 'cc.service_accounts.token_validity_in_seconds must be a positive integer' unless token_validity.is_a?(Integer) && token_validity.positive? %> service_account_provisioning: + token_validity_in_seconds: <%= token_validity %> client_id: <%= yaml_escape(p('cc.service_accounts.management_client_id')) %> client_secret: <%= yaml_escape(p('cc.service_accounts.management_client_secret')) %> identity_ca_ref: <%= identity_ca_ref.to_json %> From 1706fafa071b5fa70fe779246d863e2e536e8315 Mon Sep 17 00:00:00 2001 From: rkoster Date: Mon, 16 Nov 2026 21:13:29 +0100 Subject: [PATCH 35/35] Bump cloud_controller_ng for nested claims and configurable token validity --- 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 12534ae4a5..c2c0ea68c4 160000 --- a/src/cloud_controller_ng +++ b/src/cloud_controller_ng @@ -1 +1 @@ -Subproject commit 12534ae4a50874065e9230ba0fd4ff509ea2a209 +Subproject commit c2c0ea68c4eee80a80d93079f5c71775c86bb9a9