Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
5 changes: 5 additions & 0 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>