Remove deprecated Thin and Redis config parameters (#591)

* default configuration is now Puma as webserver and Redis/Valkey as cache
* leave threadpool_size for the moment to not break ccng config validation

Author: jochenehret

jobs/cloud_controller_ng/spec

@@ -231,12 +231,9 @@ provides:
   - ssl.skip_cert_verify
   - system_domain
   - uaa.clients.cc_routing.secret
-  - cc.experimental.use_puma_webserver
-  - cc.experimental.use_redis
   - cc.app_log_revision
   - cc.app_instance_stopping_state
   - cc.deprecated_stacks
-  - cc.temporary_enable_deprecated_thin_webserver
   - cc.custom_root_links
   - cc.feature_flag_overrides
   - cc.resource_pool.connection_config
@@ -1315,18 +1312,10 @@ properties:
     default: true
     description: "Log audit events"
 
-  cc.experimental.thin_server.thread_pool_size:
-    description: "How many threads a single cloud controller instance's thin server will attempt to use. Alter at your own peril."
-    default: 20 # inherited from default in Thin/EventMachine
-
   cc.experimental.use_yjit_compiler:
     description: "Use Ruby's YJIT compiler when running Cloud Controller API servers and workers. This feature is experimental and not recommended. Please review the drawbacks and benefits of YJIT before enabling."
     default: false
 
-  cc.experimental.use_redis:
-    description: "Use co-deployed Valkey (Redis fork) for rate limiting and metrics. If the Puma webserver is enabled, Valkey will automatically be used."
-    default: false
-
   cc.puma.automatic_worker_count:
     description: "Sets the number of Puma workers to the number of detected cores.  See https://github.com/puma/puma?tab=readme-ov-file#clustered-mode for information on how cores are detected. If set to 'true', the value set for `cc.puma.workers` will be ignored."
     default: false
@@ -1351,10 +1340,6 @@ properties:
     description: "Enable legacy MD5 buildpack paths. If disabled, xxhash64 is used for calculating paths in buildpack image layers."
     default: false
 
-  cc.temporary_enable_deprecated_thin_webserver:
-    description: "Use deprecated Thin webserver. Please note that when using Thin instead of Puma you miss out on the following benefits: Better resource utilization, well maintained and more performant. Thin will be removed in a future release. `cc.experimental.use_puma_webserver` takes precedence over this."
-    default: false
-
   cc.allow_user_creation_by_org_manager:
     description: "Allow org managers to explicitly create UAA shadow users through /v3/users and implicitly through /v3/roles. `uaa.clients.cloud_controller_shadow_user_creation.secret` must be set."
 
@@ -1368,8 +1353,3 @@ properties:
   cc.feature_flag_overrides:
     description: "Feature flag key-value pairs to override default feature flags"
     default: {}
-
-# deprecated configuration
-
-  cc.experimental.use_puma_webserver:
-    description: "Deprecated as Puma is now the default. This config flag will be removed in the future. Currently it takes precedence over `cc.temporary_enable_deprecated_thin_webserver` i.e. when set to false Thin will be used."

jobs/cloud_controller_ng/templates/bpm.yml.erb

@@ -12,22 +12,12 @@ def mount_nfs_volume!(config)
   end
 end
 
-def thin_webserver_enabled?
-  if_p('cc.experimental.use_puma_webserver') do |prop|
-   return !prop
-  end
-
-  p('cc.temporary_enable_deprecated_thin_webserver')
-end
-
 def mount_valkey_volume!(config)
-  unless thin_webserver_enabled? && !p("cc.experimental.use_redis")
-    config['additional_volumes'] = [] unless config.key?('additional_volumes')
-    config['additional_volumes'] << {
-      "path" => "/var/vcap/data/valkey",
-      "mount_only" => true,
-    }
-  end
+  config['additional_volumes'] = [] unless config.key?('additional_volumes')
+  config['additional_volumes'] << {
+    "path" => "/var/vcap/data/valkey",
+    "mount_only" => true,
+  }
 end
 
 def enable_fog_debugging!(config)

jobs/cloud_controller_ng/templates/ccng_monit_http_healthcheck.sh.erb

@@ -28,17 +28,7 @@ function log_failure {
 echo $(date --rfc-3339=ns) 'Will restart CC over on repeated failures'
 trap log_failure EXIT
 
-<%
-def thin_webserver_enabled?
-  if_p('cc.experimental.use_puma_webserver') do |prop|
-    return !prop
-  end
-
-  p('cc.temporary_enable_deprecated_thin_webserver')
-end
--%>
-
-<% if !thin_webserver_enabled? && p('cc.use_status_check') %>
+<% if p('cc.use_status_check') %>
 # Use /internal/v4/status readiness endpoint
 HOST=<%= p('cc.nginx.ip').empty? ? discover_external_ip : p('cc.nginx.ip') %>
 PORT=9021

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

@@ -42,14 +42,6 @@
     end
     raise "Error for database_encryption: #{active_keys.length} were marked active. Only one key may be active"
   end
-
-  def thin_webserver_enabled?
-  if_p('cc.experimental.use_puma_webserver') do |prop|
-   return !prop
-  end
-
-  p('cc.temporary_enable_deprecated_thin_webserver')
-end
 %>
 ---
 #Actually NGX host and port
@@ -61,7 +53,7 @@ local_route: <%= p('cc.nginx.ip') %>
 external_port: <%= p("cc.external_port") %>
 tls_port: <%= p("cc.tls_port") %>
 internal_service_hostname: <%= p("cc.internal_service_hostname") %>
-webserver: <%= thin_webserver_enabled? ? 'thin' : 'puma' %>
+webserver: puma
 puma:
   automatic_worker_count: <%= p("cc.puma.automatic_worker_count") %>
   workers: <%= p("cc.puma.workers") %>
@@ -526,10 +518,8 @@ rate_limiter_v2_api:
 
 temporary_enable_v2: <%= p("cc.temporary_enable_v2") %>
 
-<% unless thin_webserver_enabled? && !p("cc.experimental.use_redis") %>
 redis:
   socket: "/var/vcap/data/valkey/valkey.sock"
-<% end %>
 
 <%
 cc_uploader_url = nil
@@ -575,7 +565,7 @@ max_service_credential_bindings_per_app_service_instance: <%= p("cc.max_service_
 max_labels_per_resource: <%= p("cc.max_labels_per_resource") %>
 max_annotations_per_resource: <%= p("cc.max_annotations_per_resource") %>
 
-threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %>
+threadpool_size: 20
 
 default_app_lifecycle: <%= p("cc.default_app_lifecycle") %>
 custom_metric_tag_prefix_list: <%= p("cc.custom_metric_tag_prefix_list") %>

jobs/cloud_controller_ng/templates/nginx.conf.erb

@@ -54,21 +54,9 @@ limit_req_zone $http_authorization zone=<%= zone['name'] %>:10m rate=<%= zone['l
     server unix:/var/vcap/data/cloud_controller_ng/cloud_controller.sock;
   }
 
-<%
-def thin_webserver_enabled?
-  if_p('cc.experimental.use_puma_webserver') do |prop|
-    return !prop
-  end
-
-  p('cc.temporary_enable_deprecated_thin_webserver')
-end
--%>
-
-<% unless thin_webserver_enabled? -%>
   upstream cloud_controller_metrics {
     server unix:/var/vcap/data/cloud_controller_ng/cloud_controller_metrics.sock;
   }
-<% end -%>
 
   # This block ensures the endpoints it serves are handled by mutual TLS.
   # Refer to the 'return 403' statement in the http block to see how we secure those endpoints.
@@ -153,11 +141,8 @@ end
     proxy_connect_timeout       10;
 
     location /internal/v4/metrics {
-<%- if thin_webserver_enabled? -%>
-      proxy_pass http://cloud_controller;
-<%- else -%>
-      proxy_pass http://cloud_controller_metrics;
-<%- end -%>
+
+    proxy_pass http://cloud_controller_metrics;
     }
   }
 <% end -%>
@@ -200,7 +185,7 @@ end
   }
   <% end %>
 
-  <% if !thin_webserver_enabled? && p('cc.use_status_check') %>
+  <% if p('cc.use_status_check') %>
   # This block handles the /internal/v4/status endpoint for health checks, which is called by ccng_monit_http_healthcheck.
   server {
     listen 9021;

jobs/valkey/monit

@@ -1,22 +1,5 @@
-<%
-  def thin_webserver_enabled?(link)
-    link.if_p('cc.experimental.use_puma_webserver') do |prop|
-     return !prop
-    end
-
-    link.p('cc.temporary_enable_deprecated_thin_webserver')
-  end
-
-  cloud_controller_internal = link("cloud_controller_internal")
-  unless thin_webserver_enabled?(cloud_controller_internal) && !cloud_controller_internal.p("cc.experimental.use_redis")
-%>
-
 check process valkey
   with pidfile /var/vcap/sys/run/bpm/valkey/valkey.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start valkey"
   stop program "/var/vcap/jobs/bpm/bin/bpm stop valkey"
   group vcap
-
-<%
-  end
-%>

spec/cloud_controller_ng/bpm_spec.rb

@@ -113,86 +113,12 @@ def valkey_volume_mounted?(process)
           end
 
           describe 'valkey config' do
-            context 'when the puma webserver is used by default' do
-              it 'mounts the valkey volume into the ccng job container' do
-                template_hash = YAML.safe_load(template.render({}, consumes: {}))
-
-                results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                expect(results.length).to eq(1)
-                expect(valkey_volume_mounted?(results[0])).to be_truthy
-              end
-            end
-
-            context 'when the puma webserver is enabled by deprecated config' do
-              it 'mounts the valkey volume into the ccng job container' do
-                template_hash = YAML.safe_load(template.render({ 'cc' => { 'experimental' => { 'use_puma_webserver' => true } } }, consumes: {}))
-
-                results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                expect(results.length).to eq(1)
-                expect(valkey_volume_mounted?(results[0])).to be_truthy
-              end
-
-              context 'when `cc.temporary_enable_deprecated_thin_webserver` is also enabled' do
-                it 'still uses Puma and mounts the valkey volume into the ccng job container' do
-                  template_hash = YAML.safe_load(template.render(
-                                                   { 'cc' => { 'experimental' => { 'use_puma_webserver' => true },
-                                                               'temporary_enable_deprecated_thin_webserver' => true } }, consumes: {}
-                                                 ))
-
-                  results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                  expect(results.length).to eq(1)
-                  expect(valkey_volume_mounted?(results[0])).to be_truthy
-                end
-              end
-            end
+            it 'mounts the valkey volume into the ccng job container' do
+              template_hash = YAML.safe_load(template.render({}, consumes: {}))
 
-            context 'when thin webserver is explicitly enabled' do
-              context "when 'cc.experimental.use_redis' is set to 'true'" do
-                it 'mounts the valkey volume into the ccng job container' do
-                  template_hash = YAML.safe_load(
-                    template.render({ 'cc' => { 'temporary_enable_deprecated_thin_webserver' => true,
-                                                'experimental' => { 'use_redis' => true } } }, consumes: {})
-                  )
-
-                  results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                  expect(results.length).to eq(1)
-                  expect(valkey_volume_mounted?(results[0])).to be_truthy
-                end
-              end
-
-              context "when 'cc.experimental.use_redis' is not set'" do
-                it 'mounts the valkey volume into the ccng job container' do
-                  template_hash = YAML.safe_load(template.render({ 'cc' => { 'temporary_enable_deprecated_thin_webserver' => true } }, consumes: {}))
-
-                  results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                  expect(results.length).to eq(1)
-                  expect(valkey_volume_mounted?(results[0])).to be_falsey
-                end
-              end
-            end
-
-            context 'when thin webserver is implicitly enabled through `cc.experimental.use_puma_webserver` => false' do
-              context "when 'cc.experimental.use_redis' is set to 'true'" do
-                it 'mounts the valkey volume into the ccng job container' do
-                  template_hash = YAML.safe_load(
-                    template.render({ 'cc' => { 'experimental' => { 'use_puma_webserver' => false, 'use_redis' => true } } }, consumes: {})
-                  )
-
-                  results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                  expect(results.length).to eq(1)
-                  expect(valkey_volume_mounted?(results[0])).to be_truthy
-                end
-              end
-
-              context "when 'cc.experimental.use_redis' is not set'" do
-                it 'mounts the valkey volume into the ccng job container' do
-                  template_hash = YAML.safe_load(template.render({ 'cc' => { 'temporary_enable_deprecated_thin_webserver' => true } }, consumes: {}))
-
-                  results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
-                  expect(results.length).to eq(1)
-                  expect(valkey_volume_mounted?(results[0])).to be_falsey
-                end
-              end
+              results = template_hash['processes'].select { |p| p['name'].include?('cloud_controller_ng') }
+              expect(results.length).to eq(1)
+              expect(valkey_volume_mounted?(results[0])).to be_truthy
             end
           end
         end