Skip to content

Commit 9868bac

Browse files
committed
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
1 parent 1d1f61c commit 9868bac

5 files changed

Lines changed: 2 additions & 59 deletions

File tree

jobs/cloud_controller_ng/spec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,11 +1275,7 @@ properties:
12751275

12761276
cc.internal_route_vip_range:
12771277
default: "127.128.0.0/9"
1278-
description: "The IPv4 CIDR range of virtual IP addresses to be assigned to routes on internal domains.
1279-
WARNING: Changing this range is not supported, and has undefined behaviors.
1280-
It is recommended to leave this value as the default.
1281-
If this range is changed, it is likely the routes on the internal service mesh domain
1282-
will need to be recreated."
1278+
description: "This is only here cause cf networking needs it, we should coordinate a delete with them"
12831279

12841280
cc.log_audit_events:
12851281
default: true

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -569,16 +569,6 @@ perm:
569569
max_labels_per_resource: <%= p("cc.max_labels_per_resource") %>
570570
max_annotations_per_resource: <%= p("cc.max_annotations_per_resource") %>
571571

572-
<%
573-
internal_vip_range = p("cc.internal_route_vip_range")
574-
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
575-
576-
parts = internal_vip_range.split(/[\.\/]/).map(&:to_i)
577-
raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") if parts[0..3].any? {|x| x > 255} || parts[4] > 32
578-
%>
579-
580-
internal_route_vip_range: <%= internal_vip_range %>
581-
582572
threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %>
583573

584574
default_app_lifecycle: <%= p("cc.default_app_lifecycle") %>

jobs/cloud_controller_worker/spec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,7 @@ properties:
585585

586586
cc.internal_route_vip_range:
587587
default: "127.128.0.0/9"
588-
description: "The IPv4 CIDR range of virtual IP addresses to be assigned to routes on internal domains.
589-
WARNING: Changing this range is not supported, and has undefined behaviors.
590-
It is recommended to leave this value as the default.
591-
If this range is changed, it is likely the routes on the internal service mesh domain
592-
will need to be recreated."
588+
description: "This is only here cause cf networking needs it, we should coordinate a delete with them"
593589

594590
cc.loggregator.internal_url:
595591
description: "Internal URL used to communicate with traffic_controller"

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -342,16 +342,6 @@ perform_blob_cleanup: <%= p("cc.perform_blob_cleanup") %>
342342
system_domain: <%= p("system_domain") %>
343343
system_hostnames: <%= link("cloud_controller_internal").p("cc.system_hostnames") %>
344344

345-
<%
346-
internal_vip_range = p("cc.internal_route_vip_range")
347-
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
348-
349-
parts = internal_vip_range.split(/[\.\/]/).map(&:to_i)
350-
raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") if parts[0..3].any? {|x| x > 255} || parts[4] > 32
351-
%>
352-
353-
internal_route_vip_range: <%= internal_vip_range %>
354-
355345
disable_private_domain_cross_space_context_path_route_sharing: <%= link("cloud_controller_internal").p("cc.disable_private_domain_cross_space_context_path_route_sharing") %>
356346

357347
max_labels_per_resource: <%= link("cloud_controller_internal").p("cc.max_labels_per_resource") %>

spec/cloud_controller_ng/cloud_controller_ng_spec.rb

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -195,35 +195,6 @@ module Test
195195
end
196196
end
197197

198-
describe 'internal route vip range' do
199-
it 'has a default range' do
200-
rendered_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
201-
expect(rendered_hash['internal_route_vip_range']).to eq('127.128.0.0/9')
202-
end
203-
204-
describe 'when a range is specified in manifest properties' do
205-
it 'validates they are valid CIDRs' do
206-
merged_manifest_properties['cc']['internal_route_vip_range'] = '10.16.255.0/777'
207-
expect do
208-
YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
209-
end.to raise_error(StandardError, 'invalid cc.internal_route_vip_range: 10.16.255.0/777')
210-
end
211-
212-
it 'does not allow ipv6 addresses' do
213-
merged_manifest_properties['cc']['internal_route_vip_range'] = '2001:0db8:85a3:0000:0000:8a2e:0370:7334/21'
214-
expect do
215-
YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
216-
end.to raise_error(StandardError, 'invalid cc.internal_route_vip_range: 2001:0db8:85a3:0000:0000:8a2e:0370:7334/21')
217-
end
218-
219-
it 'renders valid CIDRs' do
220-
merged_manifest_properties['cc']['internal_route_vip_range'] = '10.16.255.0/24'
221-
rendered_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
222-
expect(rendered_hash['internal_route_vip_range']).to eq('10.16.255.0/24')
223-
end
224-
end
225-
end
226-
227198
describe 'database_encryption block' do
228199
context 'when the database_encryption block is not present' do
229200
before do

0 commit comments

Comments
 (0)