Skip to content

Commit eee0ead

Browse files
authored
Remove copilot (#3355)
- copilot is archived and not used no more
1 parent 0bf41de commit eee0ead

25 files changed

Lines changed: 5 additions & 1054 deletions

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
22

33
gem 'addressable'
44
gem 'allowy', '>= 2.1.0'
5-
gem 'cf-copilot', '0.0.14'
65
gem 'clockwork', require: false
76
gem 'cloudfront-signer'
87
gem 'em-http-request', '~> 1.1'

Gemfile.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ GEM
107107
bit-struct (0.17)
108108
builder (3.2.4)
109109
byebug (11.1.3)
110-
cf-copilot (0.0.14)
111-
grpc (~> 1.0)
112110
cf-uaa-lib (4.0.4)
113111
addressable (~> 2.8, >= 2.8.0)
114112
httpclient (~> 2.8, >= 2.8.2.4)
@@ -573,7 +571,6 @@ DEPENDENCIES
573571
allowy (>= 2.1.0)
574572
azure-storage-blob!
575573
byebug
576-
cf-copilot (= 0.0.14)
577574
cf-uaa-lib (~> 4.0.4)
578575
clockwork
579576
cloudfront-signer

app/actions/update_route_destinations.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def update(route, to_add, to_delete, user_audit_info, manifest_triggered)
5959
route_mapping = RouteMappingModel[rm]
6060
route_mapping.destroy
6161

62-
Copilot::Adapter.unmap_route(route_mapping)
6362
route_mapping.processes.each do |process|
6463
processes_to_ports_map[process] ||= { to_add: [], to_delete: [] }
6564
processes_to_ports_map[process][:to_delete] << route_mapping.app_port unless process.route_mappings_dataset.any? do |process_route_mapping|
@@ -80,7 +79,6 @@ def update(route, to_add, to_delete, user_audit_info, manifest_triggered)
8079
route_mapping = RouteMappingModel.new(rm)
8180
route_mapping.save
8281

83-
Copilot::Adapter.map_route(route_mapping)
8482
route_mapping.processes.each do |process|
8583
processes_to_ports_map[process] ||= { to_add: [], to_delete: [] }
8684
processes_to_ports_map[process][:to_add] << route_mapping.app_port

app/jobs/diego/sync.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'cloud_controller/diego/processes_sync'
22
require 'cloud_controller/diego/tasks_sync'
33
require 'statsd'
4-
require 'cloud_controller/copilot/sync'
54

65
module VCAP::CloudController
76
module Jobs

app/models/runtime/route_mapping_model.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
require 'cloud_controller/copilot/adapter'
2-
31
module VCAP::CloudController
42
class RouteMappingModel < Sequel::Model(:route_mappings)
53
DEFAULT_PROTOCOL_MAPPING = { 'tcp' => 'tcp', 'http' => 'http1' }.freeze
@@ -45,14 +43,6 @@ def self.user_visibility_filter(user)
4543
{ space: Space.user_visible(user) }
4644
end
4745

48-
def after_destroy
49-
super
50-
51-
db.after_commit do
52-
Copilot::Adapter.unmap_route(self)
53-
end
54-
end
55-
5646
def adapted_weight
5747
weight || 1
5848
end

config/cloud_controller.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ default_health_check_timeout: 60
219219
maximum_health_check_timeout: 180
220220

221221
disable_custom_buildpacks: false
222-
copilot:
223-
enabled: false
224222
broker_client_timeout_seconds: 60
225223

226224
uaa_client_name: 'cc-service-dashboards'
@@ -377,15 +375,6 @@ credhub_api:
377375
credential_references:
378376
interpolate_service_bindings: true
379377

380-
copilot:
381-
enabled: false
382-
host: copilot.service.cf.internal
383-
port: 9080
384-
client_ca_file: 'spec/fixtures/certs/copilot_ca.crt'
385-
client_key_file: 'spec/fixtures/certs/copilot.key'
386-
client_chain_file: 'spec/fixtures/certs/copilot.crt'
387-
sync_frequency_in_seconds: 30
388-
389378
internal_route_vip_range: '127.128.0.0/9'
390379

391380
locket:

lib/cloud_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ module VCAP::CloudController; end
113113

114114
require 'cloud_controller/route_binding_message'
115115
require 'cloud_controller/process_route_handler'
116-
require 'cloud_controller/copilot/adapter'
117116

118117
require 'cloud_controller/isolation_segment_selector'
119118
require 'cloud_controller/user_audit_info'

lib/cloud_controller/backends/copilot_runner_delegator.rb

Lines changed: 0 additions & 26 deletions
This file was deleted.

lib/cloud_controller/backends/runners.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
require 'cloud_controller/diego/buildpack/lifecycle_protocol'
55
require 'cloud_controller/diego/docker/lifecycle_protocol'
66
require 'cloud_controller/diego/egress_rules'
7-
require 'cloud_controller/backends/copilot_runner_delegator'
87

98
module VCAP::CloudController
109
class Runners
@@ -13,9 +12,7 @@ def initialize(config)
1312
end
1413

1514
def runner_for_process(process)
16-
# TODO: stop using this Copilot wrapper since no more Copilot
17-
# see: https://github.com/cloudfoundry/istio-release#deprecated
18-
CopilotRunnerDelegator.new(diego_runner(process), process)
15+
diego_runner(process)
1916
end
2017

2118
def diego_processes(batch_size, last_id)

lib/cloud_controller/config_schemas/base/api_schema.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -345,16 +345,6 @@ class ApiSchema < VCAP::Config
345345
optional(:query_raise_on_mismatch) => bool
346346
},
347347

348-
optional(:copilot) => {
349-
enabled: bool,
350-
optional(:host) => String,
351-
optional(:port) => Integer,
352-
optional(:client_ca_file) => String,
353-
optional(:client_key_file) => String,
354-
optional(:client_chain_file) => String,
355-
optional(:temporary_istio_domains) => Array
356-
},
357-
358348
max_labels_per_resource: Integer,
359349
max_annotations_per_resource: Integer,
360350

0 commit comments

Comments
 (0)