Remove istio dependent code (#268)

istio never GA'd and we don't need to have the code in
cf-networking-release.

Author: winkingturtle-vmw

jobs/bosh-dns-adapter/spec

@@ -21,9 +21,6 @@ consumes:
   - name: cloud_controller_container_networking_info
     type: cloud_controller_container_networking_info
     optional: true
-  - name: vip_resolver_conn
-    type: vip_resolver_conn
-    optional: true
 
 properties:
   cf_app_sd_disable:

jobs/bosh-dns-adapter/templates/config.json.erb

@@ -15,13 +15,6 @@ def internal_route_vip_range
   end
 end
 
-def vip_resolver_address 
-  if_link('vip_resolver_conn') do |link|
-    return "#{link.address}:#{link.p('listen_port_for_vip_resolver')}"
-  end
-  ''
-end
-
 def parse_ip (ip, var_name)
   unless ip.empty?
       begin
@@ -49,7 +42,6 @@ config = {
     'log_level_port' => p('log_level_port'),
     'internal_service_mesh_domains' => internal_service_mesh_domains,
     'internal_route_vip_range' => internal_route_vip_range,
-    'vip_resolver_address' => vip_resolver_address,
 }
 
 require 'json'

packages/bosh-dns-adapter/spec

@@ -11,8 +11,6 @@ files:
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/bbs/db/sqldb/helpers/monitor/*.go # gosub
   - code.cloudfoundry.org/bosh-dns-adapter/*.go # gosub
   - code.cloudfoundry.org/bosh-dns-adapter/config/*.go # gosub
-  - code.cloudfoundry.org/bosh-dns-adapter/copilot/*.go # gosub
-  - code.cloudfoundry.org/bosh-dns-adapter/copilot/api/*.go # gosub
   - code.cloudfoundry.org/bosh-dns-adapter/handlers/*.go # gosub
   - code.cloudfoundry.org/bosh-dns-adapter/sdcclient/*.go # gosub
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/cf-networking-helpers/db/*.go # gosub
@@ -46,12 +44,6 @@ files:
   - code.cloudfoundry.org/vendor/github.com/cloudfoundry/dropsonde/runtime_stats/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/cloudfoundry/sonde-go/events/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/go-sql-driver/mysql/*.go # gosub
-  - code.cloudfoundry.org/vendor/github.com/golang/protobuf/jsonpb/*.go # gosub
-  - code.cloudfoundry.org/vendor/github.com/golang/protobuf/proto/*.go # gosub
-  - code.cloudfoundry.org/vendor/github.com/golang/protobuf/ptypes/*.go # gosub
-  - code.cloudfoundry.org/vendor/github.com/golang/protobuf/ptypes/any/*.go # gosub
-  - code.cloudfoundry.org/vendor/github.com/golang/protobuf/ptypes/duration/*.go # gosub
-  - code.cloudfoundry.org/vendor/github.com/golang/protobuf/ptypes/timestamp/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/jmoiron/sqlx/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/jmoiron/sqlx/reflectx/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/lib/pq/*.go # gosub
@@ -66,82 +58,13 @@ files:
   - code.cloudfoundry.org/vendor/github.com/tedsuo/ifrit/http_server/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/tedsuo/ifrit/sigmon/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/tedsuo/rata/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/context/*.go # gosub
   - code.cloudfoundry.org/vendor/golang.org/x/net/dns/dnsmessage/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/http/httpguts/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/http2/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/http2/hpack/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/idna/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/internal/timeseries/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/net/trace/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/sys/unix/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/sys/unix/*.s # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/sys/windows/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/sys/windows/*.s # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/text/secure/bidirule/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/text/transform/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/text/unicode/bidi/*.go # gosub
-  - code.cloudfoundry.org/vendor/golang.org/x/text/unicode/norm/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/attributes/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/backoff/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/balancer/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/balancer/base/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/balancer/grpclb/state/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/balancer/roundrobin/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/channelz/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/codes/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/connectivity/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/credentials/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/credentials/insecure/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/encoding/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/encoding/proto/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/grpclog/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/backoff/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/balancerload/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/binarylog/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/buffer/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/channelz/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/credentials/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/envconfig/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/grpclog/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/grpcrand/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/grpcsync/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/grpcutil/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/idle/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/metadata/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/pretty/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/resolver/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/resolver/dns/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/resolver/dns/internal/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/resolver/passthrough/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/resolver/unix/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/serviceconfig/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/status/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/syscall/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/transport/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/transport/networktype/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/keepalive/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/metadata/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/peer/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/resolver/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/resolver/dns/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/serviceconfig/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/stats/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/status/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/grpc/tap/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/encoding/protojson/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/encoding/prototext/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/encoding/protowire/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/descfmt/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/descopts/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/detrand/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/encoding/defval/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/encoding/json/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/encoding/messageset/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/encoding/tag/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/encoding/text/*.go # gosub
@@ -157,15 +80,9 @@ files:
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/strs/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/internal/version/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/proto/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/reflect/protodesc/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/reflect/protodesc/*.binpb # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/reflect/protoreflect/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/reflect/protoregistry/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/runtime/protoiface/*.go # gosub
   - code.cloudfoundry.org/vendor/google.golang.org/protobuf/runtime/protoimpl/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/types/descriptorpb/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/types/known/anypb/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/types/known/durationpb/*.go # gosub
-  - code.cloudfoundry.org/vendor/google.golang.org/protobuf/types/known/timestamppb/*.go # gosub
   - code.cloudfoundry.org/vendor/gopkg.in/gorp.v1/*.go # gosub
   - code.cloudfoundry.org/vendor/gopkg.in/validator.v2/*.go # gosub

spec/bosh-dns-adapter/bosh_dns_adapter_spec.rb

@@ -31,7 +31,7 @@ module Bosh::Template::Test
       it 'sets the open file descriptor limit' do
         expect(config['processes'][0]['limits']['open_files']).to eq(65_535)
       end
-      
+
       it 'adds a healthcheck process' do
         expect(config['processes'][1]).to eq({
           "name" => "bosh-dns-adapter-healthchecker",
@@ -77,7 +77,6 @@ module Bosh::Template::Test
           'service_discovery_controller_port' => '1234',
           'internal_service_mesh_domains' => [],
           'internal_route_vip_range' => '192.168.0.1/24',
-          'vip_resolver_address' => '',
         })
       end
 
@@ -122,30 +121,10 @@ module Bosh::Template::Test
             'service_discovery_controller_port' => '1234',
             'internal_route_vip_range' => '127.128.0.0/8',
             'internal_service_mesh_domains' => ['myistio.internal.app.domain.'],
-            'vip_resolver_address' => '',
           })
         end
       end
 
-      describe 'when the optional vip_resolver_conn link is provided' do
-        let(:links_with_vip_resolver_conn) do
-          links << Link.new(
-            name: 'vip_resolver_conn',
-            properties: {
-              'listen_port_for_vip_resolver' => 1234,
-            },
-            address: 'copilot.bosh',
-          )
-        end
-
-        it 'renders the copilot address:port in the json' do
-          template_str = template.render(merged_manifest_properties, consumes: links_with_vip_resolver_conn)
-          config = JSON.parse(template_str)
-          expect(config['vip_resolver_address']).to eq('copilot.bosh:1234')
-        end
-      end
-    end
-
     describe 'handlers.json' do
       let(:template) {job.template('dns/handlers.json')}
 
@@ -222,3 +201,4 @@ module Bosh::Template::Test
     end
   end
 end
+end

src/code.cloudfoundry.org/bosh-dns-adapter/config/config.go

@@ -23,7 +23,6 @@ type Config struct {
 	LogLevelPort                      int      `json:"log_level_port" validate:"min=1"`
 	InternalServiceMeshDomains        []string `json:"internal_service_mesh_domains"`
 	InternalRouteVIPRange             string   `json:"internal_route_vip_range" validate:"cidr"`
-	VIPResolverAddress                string   `json:"vip_resolver_address"`
 }
 
 func init() {

src/code.cloudfoundry.org/bosh-dns-adapter/config/config_test.go

@@ -30,8 +30,7 @@ var _ = Describe("Config", func() {
 				"metron_port": 8080,
 				"log_level_address": "log-level-address",
 				"internal_route_vip_range": "127.128.0.0/24",
-				"log_level_port": 9090,
-				"vip_resolver_address": "copilot.server.bosh:1002"
+				"log_level_port": 9090
 			}`)
 			parsedConfig, err = NewConfig(configJSON)
 			Expect(err).ToNot(HaveOccurred())
@@ -51,7 +50,6 @@ var _ = Describe("Config", func() {
 			Expect(parsedConfig.LogLevelAddress).To(Equal("log-level-address"))
 			Expect(parsedConfig.LogLevelPort).To(Equal(9090))
 			Expect(parsedConfig.InternalRouteVIPRange).To(Equal("127.128.0.0/24"))
-			Expect(parsedConfig.VIPResolverAddress).To(Equal("copilot.server.bosh:1002"))
 		})
 
 		It("returns a parsed CIDR struct", func() {