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 5c96e92178..54adc4f9c3 100644 --- a/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb +++ b/jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb @@ -278,3 +278,7 @@ cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_ma custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %> app_log_revision: <%= link("cloud_controller_internal").p("cc.app_log_revision") %> + +<% link("cloud_controller_internal").if_p("cc.feature_flag_overrides") do |feature_flag_overrides| %> +feature_flag_overrides: <%= feature_flag_overrides.to_json %> +<% end %> 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 b1030f8ac2..ad6dd7890c 100644 --- a/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb @@ -367,3 +367,7 @@ cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_ma custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %> app_log_revision: <%= link("cloud_controller_internal").p("cc.app_log_revision") %> + +<% link("cloud_controller_internal").if_p("cc.feature_flag_overrides") do |feature_flag_overrides| %> +feature_flag_overrides: <%= feature_flag_overrides.to_json %> +<% end %> diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 993fd983de..e219c1349d 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -233,6 +233,7 @@ provides: - cc.deprecated_stacks - cc.temporary_enable_deprecated_thin_webserver - cc.custom_root_links + - cc.feature_flag_overrides consumes: - name: database @@ -1331,6 +1332,10 @@ properties: description: "Let monit use the /internal/v4/status endpoint to determine if the Cloud Controller is healthy. Only if the status endpoint returns unhealthy or the status has not been OK for 600 seconds, it will trigger a restart. This only takes effect when Puma is used." default: false + cc.feature_flag_overrides: + description: "Feature flag key-value pairs to override default feature flags" + default: {} + # deprecated configuration cc.experimental.use_puma_webserver: 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 a8dfdd3f5d..9426f407c0 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -591,3 +591,7 @@ allow_user_creation_by_org_manager: <%= allow_user_creation %> <% if_p("cc.enable_ipv6") do |enable_ipv6| %> enable_ipv6: <%= enable_ipv6 %> <% end %> + +<% if_p("cc.feature_flag_overrides") do |feature_flag_overrides| %> +feature_flag_overrides: <%= feature_flag_overrides.to_json %> +<% end %> 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 7583a43b37..d42e10f8c0 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -367,3 +367,7 @@ prometheus_port: <%= p("cc.prometheus_port") %> default_app_lifecycle: <%= link("cloud_controller_internal").p("cc.default_app_lifecycle") %> directories: tmpdir: <%= p("cc.directories.tmpdir") %> + +<% link("cloud_controller_internal").if_p("cc.feature_flag_overrides") do |feature_flag_overrides| %> +feature_flag_overrides: <%= feature_flag_overrides.to_json %> +<% end %>