From ca66f08f9db0e42c2f8c120d364b3d9343f38b75 Mon Sep 17 00:00:00 2001 From: "M. Oleske" Date: Fri, 24 May 2024 15:54:50 -0700 Subject: [PATCH] Mostly remove internal_route_vip_range - cf-networking-release expects a bosh link to consume for us, so we can actually remove the property til they stop wanting it - https://github.com/cloudfoundry/cf-networking-release/blob/a0b0fc7de7d3dd8564e3ab1fbb0f5b4f7e29791f/jobs/garden-cni/spec#L11-L13 --- jobs/cloud_controller_ng/spec | 6 +--- .../templates/cloud_controller_ng.yml.erb | 10 ------- jobs/cloud_controller_worker/spec | 6 +--- .../templates/cloud_controller_ng.yml.erb | 10 ------- .../cloud_controller_ng_spec.rb | 29 ------------------- 5 files changed, 2 insertions(+), 59 deletions(-) diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index fc5988cb2a..91a1f2a0d5 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -1235,11 +1235,7 @@ properties: cc.internal_route_vip_range: default: "127.128.0.0/9" - description: "The IPv4 CIDR range of virtual IP addresses to be assigned to routes on internal domains. - WARNING: Changing this range is not supported, and has undefined behaviors. - It is recommended to leave this value as the default. - If this range is changed, it is likely the routes on the internal service mesh domain - will need to be recreated." + description: "This is only here cause cf networking needs it, we should coordinate a delete with them" cc.log_audit_events: default: true 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 132a55e70d..0fe899a8a8 100644 --- a/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb @@ -546,16 +546,6 @@ perm: max_labels_per_resource: <%= p("cc.max_labels_per_resource") %> max_annotations_per_resource: <%= p("cc.max_annotations_per_resource") %> -<% - internal_vip_range = p("cc.internal_route_vip_range") - raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") unless internal_vip_range =~ /\A (?:\d{1,3}\.){3} \d{1,3} \/ \d{1,3} \z/x - - parts = internal_vip_range.split(/[\.\/]/).map(&:to_i) - raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") if parts[0..3].any? {|x| x > 255} || parts[4] > 32 -%> - -internal_route_vip_range: <%= internal_vip_range %> - threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %> default_app_lifecycle: buildpack diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index 79a5cc3cd3..caf342840d 100644 --- a/jobs/cloud_controller_worker/spec +++ b/jobs/cloud_controller_worker/spec @@ -542,11 +542,7 @@ properties: cc.internal_route_vip_range: default: "127.128.0.0/9" - description: "The IPv4 CIDR range of virtual IP addresses to be assigned to routes on internal domains. - WARNING: Changing this range is not supported, and has undefined behaviors. - It is recommended to leave this value as the default. - If this range is changed, it is likely the routes on the internal service mesh domain - will need to be recreated." + description: "This is only here cause cf networking needs it, we should coordinate a delete with them" cc.loggregator.internal_url: description: "Internal URL used to communicate with traffic_controller" 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 62053c7d21..b15181906d 100644 --- a/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb +++ b/jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb @@ -332,16 +332,6 @@ perform_blob_cleanup: <%= p("cc.perform_blob_cleanup") %> system_domain: <%= p("system_domain") %> system_hostnames: <%= link("cloud_controller_internal").p("cc.system_hostnames") %> -<% - internal_vip_range = p("cc.internal_route_vip_range") - raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") unless internal_vip_range =~ /\A (?:\d{1,3}\.){3} \d{1,3} \/ \d{1,3} \z/x - - parts = internal_vip_range.split(/[\.\/]/).map(&:to_i) - raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") if parts[0..3].any? {|x| x > 255} || parts[4] > 32 -%> - -internal_route_vip_range: <%= internal_vip_range %> - disable_private_domain_cross_space_context_path_route_sharing: <%= link("cloud_controller_internal").p("cc.disable_private_domain_cross_space_context_path_route_sharing") %> max_labels_per_resource: <%= link("cloud_controller_internal").p("cc.max_labels_per_resource") %> diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 00cdae7640..2592e21322 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -195,35 +195,6 @@ module Test end end - describe 'internal route vip range' do - it 'has a default range' do - rendered_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - expect(rendered_hash['internal_route_vip_range']).to eq('127.128.0.0/9') - end - - describe 'when a range is specified in manifest properties' do - it 'validates they are valid CIDRs' do - merged_manifest_properties['cc']['internal_route_vip_range'] = '10.16.255.0/777' - expect do - YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - end.to raise_error(StandardError, 'invalid cc.internal_route_vip_range: 10.16.255.0/777') - end - - it 'does not allow ipv6 addresses' do - merged_manifest_properties['cc']['internal_route_vip_range'] = '2001:0db8:85a3:0000:0000:8a2e:0370:7334/21' - expect do - YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - end.to raise_error(StandardError, 'invalid cc.internal_route_vip_range: 2001:0db8:85a3:0000:0000:8a2e:0370:7334/21') - end - - it 'renders valid CIDRs' do - merged_manifest_properties['cc']['internal_route_vip_range'] = '10.16.255.0/24' - rendered_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) - expect(rendered_hash['internal_route_vip_range']).to eq('10.16.255.0/24') - end - end - end - describe 'database_encryption block' do context 'when the database_encryption block is not present' do before do