diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index fc5988cb2a..4d0d1d7325 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -211,6 +211,7 @@ provides: - cc.statsd_port - cc.enable_statsd_metrics - cc.system_hostnames + - cc.temporary_enable_v2 - cc.tls_port - cc.uaa.client_timeout - cc.internal_route_vip_range diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 42991bdb37..79a5cc3cd3 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -388,10 +388,6 @@ properties: default: false description: "Enable development features for monitoring and insight" - cc.temporary_enable_v2: - description: "Enable V2 endpoints" - default: true - cc.newrelic.license_key: default: ~ description: "The api key for NewRelic" 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 9744846af2..867dfc169a 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -128,7 +128,7 @@ db: &db <% system_domain = p("system_domain") %> -temporary_enable_v2: <%= p("cc.temporary_enable_v2") %> +temporary_enable_v2: <%= link("cloud_controller_internal").p("cc.temporary_enable_v2") %> uaa: internal_url: <%= "https://#{p("cc.uaa.internal_url")}:#{p("uaa.ssl.port")}" %> diff --git a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb index b755bfe4bd..dbb45bb2ed 100644 --- a/spec/cloud_controller_worker/cloud_controller_worker_spec.rb +++ b/spec/cloud_controller_worker/cloud_controller_worker_spec.rb @@ -80,12 +80,14 @@ module Test 'jobs' => { 'enable_dynamic_job_priorities' => false }, - 'app_log_revision' => true + 'app_log_revision' => true, + 'temporary_enable_v2' => true } } end + let(:cloud_controller_internal_link) do - Link.new(name: 'cloud_controller_internal', properties:, instances: [LinkInstance.new(address: 'default_app_ssh_access')]) + Link.new(name: 'cloud_controller_internal', properties:, instances: [LinkInstance.new(address: 'default_app_ssh_access'), LinkInstance.new(address: 'cc.temporary_enable_v2')]) end let(:cloud_controller_db_link) do @@ -265,16 +267,6 @@ module Test expect(template_hash['temporary_enable_v2']).to be(true) end - context 'when explicitly disabled' do - before do - manifest_properties['cc']['temporary_enable_v2'] = false - end - - it 'is false' do - template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links)) - expect(template_hash['temporary_enable_v2']).to be(false) - end - end end end end