diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 7c30bf41be..b3b49220fd 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -1223,10 +1223,6 @@ properties: 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_optimized_json_encoder: - description: "Switch to a different Ruby JSON encoder, i.e. Oj (https://github.com/ohler55/oj)." - default: false - cc.kubernetes.host_url: description: "Kubernetes master API URL" cc.kubernetes.service_account.name: 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 8992cd012d..6e18aca3a9 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -536,8 +536,6 @@ internal_route_vip_range: <%= internal_vip_range %> threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %> -use_optimized_json_encoder: <%= p("cc.experimental.use_optimized_json_encoder") %> - <% if_p("cc.kubernetes.host_url") do %> kubernetes: host_url: <%= p("cc.kubernetes.host_url") %>