Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e7231e0
Test service account worker configuration rendering (red)
rkoster Oct 5, 2026
84b1895
Render dedicated service account worker trust and credentials
rkoster Oct 5, 2026
bd7d883
Test service account API gate and discovery rendering (red)
rkoster Oct 5, 2026
333cda0
Render default-off service account API and runtime gates
rkoster Oct 5, 2026
ed47d22
Test service account clock runtime rendering (red)
rkoster Oct 5, 2026
7dbf40b
Render service account runtime discovery in clock config
rkoster Oct 5, 2026
d2f5bb7
Bump cloud_controller_ng for space-owned service account POC
rkoster Oct 5, 2026
fefb8c4
Make packaged application directories readable by runtime user
rkoster Oct 6, 2026
9fa307b
Bump cloud_controller_ng for MySQL service account migration recovery
rkoster Oct 6, 2026
ca65001
Bump cloud_controller_ng for normalized UAA client reconciliation
rkoster Oct 6, 2026
fbd0c3e
Test configurable service account creation budget rendering (red)
rkoster Oct 7, 2026
e2a5bce
Render configurable weekly service account creation limit
rkoster Oct 7, 2026
a186d2d
Bump cloud_controller_ng for creation budget and recursive account cl…
rkoster Oct 7, 2026
5089b31
Test rendering service account trust bundle reference for workers (red)
rkoster Oct 16, 2026
90d4e4b
Render service account trust bundle reference for workers
rkoster Oct 16, 2026
7bc5fe1
Bump cloud_controller_ng for trust bundle references and owned trust …
rkoster Oct 16, 2026
42721a2
Bump cloud_controller_ng for management client updates
rkoster Oct 16, 2026
6845b53
Test requiring a trust bundle reference for worker provisioning (red)
rkoster Oct 16, 2026
1178b26
Require a UAA trust bundle reference for worker provisioning
rkoster Oct 16, 2026
f267b9e
Bump cloud_controller_ng for reference-only account client trust
rkoster Oct 16, 2026
5bf253a
Test qualified service account rollout contract configuration (red)
rkoster Nov 9, 2026
529111e
Render explicit qualified account runtime and router contract gates
rkoster Nov 9, 2026
d68052f
Test worker named federation policy configuration (red)
rkoster Nov 9, 2026
9bb5a71
Render optional named service account federation policy for workers
rkoster Nov 9, 2026
d4be075
Bump cloud_controller_ng for org-owned service accounts and entitleme…
rkoster Nov 9, 2026
39aded2
Bump cloud_controller_ng for active entitlement source checks
rkoster Nov 9, 2026
6748aa4
Test no router contract version is declared or rendered (red)
rkoster Nov 10, 2026
fe5ce04
Remove the extra service account router contract property
rkoster Nov 10, 2026
3d42b62
Bump cloud_controller_ng to remove router contract gating
rkoster Nov 10, 2026
9598813
Test single service account activation across CAPI jobs (red)
rkoster Nov 12, 2026
d2f54a1
Render one service account enable property for all CAPI jobs
rkoster Nov 12, 2026
ea01619
Bump cloud_controller_ng for review fixes and single account activation
rkoster Nov 12, 2026
eaabd36
Test operator configured service account token validity (red)
rkoster Nov 16, 2026
1c650e9
Expose service account token validity to platform operators
rkoster Nov 16, 2026
1706faf
Bump cloud_controller_ng for nested claims and configurable token val…
rkoster Nov 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jobs/cc_deployment_updater/spec
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"

Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions jobs/cloud_controller_clock/spec
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,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 for account discovery.
default: ""
ssl.skip_cert_verify:
description: "specifies that the job is allowed to skip ssl cert verification"
default: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ uaa:
<% end %>

# App staging parameters
service_accounts_enabled: <%= p('cc.service_accounts.enabled') %>
service_account_token_endpoint: <%= yaml_escape(p('cc.service_accounts.token_endpoint')) %>

staging:
timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %>
auth:
Expand Down
9 changes: 9 additions & 0 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,15 @@ 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.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: ""
ssl.skip_cert_verify:
description: "specifies that the job is allowed to skip ssl cert verification"
default: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,10 @@ credential_references:
interpolate_service_bindings: <%= p("cc.credential_references.interpolate_service_bindings") %>

# App staging parameters
service_accounts_enabled: <%= p('cc.service_accounts.enabled') %>
service_account_creation_limit: <%= p('cc.service_accounts.creation_limit') %>
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") %>
Expand Down
22 changes: 21 additions & 1 deletion jobs/cloud_controller_worker/spec
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,27 @@ 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: ""
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: ""
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_ref:
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"
default: false
Expand Down Expand Up @@ -599,4 +620,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

19 changes: 19 additions & 0 deletions jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,25 @@ uaa:
client_timeout: <%= cc_internal.p("cc.uaa.client_timeout")%>
<% end %>

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.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?
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 %>
<% 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
staging:
timeout_in_seconds: <%= p("cc.staging_timeout_in_seconds") %>
Expand Down
3 changes: 3 additions & 0 deletions packages/cloud_controller_ng/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions spec/cc_deployment_updater/cc_deployment_updater_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
7 changes: 7 additions & 0 deletions spec/cloud_controller_clock/cloud_controller_clock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = { 'enabled' => true, 'token_endpoint' => 'https://uaa.example.test/oauth/token/mtls' }
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/token/mtls')
end

it 'creates the cloud_controller_ng.yml config file' do
expect do
YAML.safe_load(template.render(manifest_properties, consumes: links))
Expand Down
32 changes: 32 additions & 0 deletions spec/cloud_controller_ng/cloud_controller_ng_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,38 @@ 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 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_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')
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'] = {
'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_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

it 'creates the cloud_controller_ng.yml config file' do
expect do
YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
Expand Down
65 changes: 65 additions & 0 deletions spec/cloud_controller_worker/cloud_controller_worker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,71 @@ 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'] = {
'enabled' => true,
'management_client_id' => 'account-manager',
'management_client_secret' => 'manager-secret',
'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_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,
'management_client_id' => 'account-manager',
'management_client_secret' => 'manager-secret'
}
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'] = {
'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

it 'keeps service account runtime and provisioning disabled by default' do
result = YAML.safe_load(template.render(manifest_properties, consumes: links))
expect(result['service_accounts_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))
Expand Down
2 changes: 1 addition & 1 deletion src/cloud_controller_ng