Skip to content

Commit 935ea54

Browse files
committed
Mostly remove internal_routte_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 ddf23c8 commit 935ea54

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
@@ -1212,11 +1212,7 @@ properties:
12121212

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

12211217
cc.log_audit_events:
12221218
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
@@ -525,16 +525,6 @@ perm:
525525
max_labels_per_resource: <%= p("cc.max_labels_per_resource") %>
526526
max_annotations_per_resource: <%= p("cc.max_annotations_per_resource") %>
527527

528-
<%
529-
internal_vip_range = p("cc.internal_route_vip_range")
530-
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
531-
532-
parts = internal_vip_range.split(/[\.\/]/).map(&:to_i)
533-
raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") if parts[0..3].any? {|x| x > 255} || parts[4] > 32
534-
%>
535-
536-
internal_route_vip_range: <%= internal_vip_range %>
537-
538528
threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %>
539529

540530
default_app_lifecycle: buildpack

jobs/cloud_controller_worker/spec

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

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

541537
cc.loggregator.internal_url:
542538
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
@@ -331,16 +331,6 @@ perform_blob_cleanup: <%= p("cc.perform_blob_cleanup") %>
331331
system_domain: <%= p("system_domain") %>
332332
system_hostnames: <%= link("cloud_controller_internal").p("cc.system_hostnames") %>
333333

334-
<%
335-
internal_vip_range = p("cc.internal_route_vip_range")
336-
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
337-
338-
parts = internal_vip_range.split(/[\.\/]/).map(&:to_i)
339-
raise StandardError.new("invalid cc.internal_route_vip_range: #{internal_vip_range}") if parts[0..3].any? {|x| x > 255} || parts[4] > 32
340-
%>
341-
342-
internal_route_vip_range: <%= internal_vip_range %>
343-
344334
disable_private_domain_cross_space_context_path_route_sharing: <%= link("cloud_controller_internal").p("cc.disable_private_domain_cross_space_context_path_route_sharing") %>
345335

346336
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
@@ -193,35 +193,6 @@ module Test
193193
end
194194
end
195195

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

0 commit comments

Comments
 (0)