Create route CRDs when a route is mapped

- Removed a few calls to deprecated Copilot component
- Applies to v2 route mapping and v3 route mappings (destinations)

[#171826991]

Co-authored-by: Alex Standke <astandke@vmware.com>
Co-authored-by: Seth Boyles <sboyles@pivotal.io>
Co-authored-by: Christian Ang <cang@pivotal.io>
Co-authored-by: Nitya Dhanushkodi <ndhanushkodi@pivotal.io>
Co-authored-by: Renee Chu <rchu@pivotal.io>
Co-authored-by: Piyali Banerjee <pbanerjee@pivotal.io>
Co-authored-by: Tim Downey <tdowney@vmware.com>

Author: 8 people

app/actions/route_create.rb

@@ -11,8 +11,8 @@ def create(message:, space:, domain:)
       route = Route.new(
         host: message.host || '',
         path: message.path || '',
-        space_guid: message.space_guid,
-        domain_guid: message.domain_guid
+        space: space,
+        domain: domain,
       )
 
       Route.db.transaction do
@@ -27,13 +27,26 @@ def create(message:, space:, domain:)
         message.audit_hash,
         manifest_triggered: false,
       )
+
+      if kubernetes_api_configured?
+        route_crd_client.create_route(route)
+      end
+
       route
     rescue Sequel::ValidationFailed => e
       validation_error!(e, route.host, route.path, space, domain)
     end
 
     private
 
+    def route_crd_client
+      @route_crd_client ||= CloudController::DependencyLocator.instance.route_crd_client
+    end
+
+    def kubernetes_api_configured?
+      !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
+    end
+
     def validation_error!(error, host, path, space, domain)
       if error.errors.on(:domain)&.include?(:invalid_relation)
         error!("Invalid domain. Domain '#{domain.name}' is not available in organization '#{space.organization.name}'.")

app/actions/update_route_destinations.rb

@@ -96,6 +96,13 @@ def update(route, to_add, to_delete, user_audit_info, manifest_triggered)
         end
 
         route.reload
+
+        if kubernetes_api_configured?
+          client = route_crd_client
+          client.update_destinations(route)
+        end
+
+        route
       end
 
       def update_processes(processes_to_ports_map)
@@ -160,6 +167,14 @@ def destination_to_mapping_hash(route, destination)
         }
       end
 
+      def route_crd_client
+        CloudController::DependencyLocator.instance.route_crd_client
+      end
+
+      def kubernetes_api_configured?
+        !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
+      end
+
       def validate_unique!(new_route_mappings)
         raise DuplicateDestinationError.new('Destinations cannot contain duplicate entries') if new_route_mappings.any? { |rm| new_route_mappings.count(rm) > 1 }
       end

app/actions/v2/route_create.rb

@@ -7,14 +7,30 @@ def initialize(access_validator:, logger:)
       end
 
       def create_route(route_hash:)
-        Route.db.transaction do
-          route = Route.create_from_hash(route_hash)
-          @access_validator.validate_access(:create, route)
+        route = Route.db.transaction do
+          r = Route.create_from_hash(route_hash)
+          access_validator.validate_access(:create, r)
 
-          Copilot::Adapter.create_route(route)
+          r
+        end
 
-          route
+        if kubernetes_api_configured?
+          route_crd_client.create_route(route)
         end
+
+        route
+      end
+
+      private
+
+      attr_reader :access_validator
+
+      def route_crd_client
+        @route_crd_client ||= CloudController::DependencyLocator.instance.route_crd_client
+      end
+
+      def kubernetes_api_configured?
+        !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
       end
     end
   end

app/actions/v2/route_mapping_create.rb

@@ -42,14 +42,16 @@ def add
           route_mapping.save
           route_handler.update_route_information
 
-          Copilot::Adapter.map_route(route_mapping)
-
           app_event_repository.record_map_route(
             user_audit_info,
             route_mapping
           )
         end
 
+        if kubernetes_api_configured?
+          route_crd_client.update_destinations(route_mapping.route)
+        end
+
         route_mapping
       rescue Sequel::ValidationFailed => e
         if e.errors && e.errors.on([:app_guid, :route_guid, :process_type, :app_port]) && e.errors.on([:app_guid, :route_guid, :process_type, :app_port]).include?(:unique)
@@ -63,6 +65,10 @@ def add
 
       attr_reader :request_attrs, :user_audit_info, :app, :route, :process
 
+      def route_crd_client
+        @route_crd_client ||= CloudController::DependencyLocator.instance.route_crd_client
+      end
+
       def requested_port
         @requested_port ||= request_attrs.key?('app_port') ? request_attrs['app_port'] : process.ports.try(:first)
       end
@@ -123,6 +129,10 @@ def validate_routing_api_enabled!
           raise RoutingApiDisabledError.new('Routing API is disabled')
         end
       end
+
+      def kubernetes_api_configured?
+        !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
+      end
     end
   end
 end

app/actions/v3/route_create.rb

@@ -4,13 +4,23 @@ class RouteCreate
       class << self
         def create_route(route_hash:, logger:, user_audit_info:, manifest_triggered: false)
           route = Route.create_from_hash(route_hash)
-
-          Copilot::Adapter.create_route(route)
+          if kubernetes_api_configured?
+            client = route_crd_client
+            client.create_route(route)
+          end
 
           Repositories::RouteEventRepository.new.record_route_create(route, user_audit_info, route_hash, manifest_triggered: manifest_triggered)
 
           route
         end
+
+        def route_crd_client
+          CloudController::DependencyLocator.instance.route_crd_client
+        end
+
+        def kubernetes_api_configured?
+          !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
+        end
       end
     end
   end

config/cloud_controller.yml

@@ -296,6 +296,7 @@ kubernetes:
   service_account:
     token_file: "spec/fixtures/service_accounts/k8s.token"
   ca_file: "spec/fixtures/certs/kubernetes_ca.crt"
+  workloads_namespace: 'cf-workloads'
   kpack:
     builder_namespace: 'cf-workloads'
     registry_service_account_name: 'fake-registry-service-account'

lib/cloud_controller/config_schemas/api_schema.rb

@@ -360,6 +360,7 @@ class ApiSchema < VCAP::Config
               token_file: String,
             },
             ca_file: String,
+            workloads_namespace: String,
             optional(:kpack) => {
               builder_namespace: String,
               registry_service_account_name: String,

lib/cloud_controller/config_schemas/deployment_updater_schema.rb

@@ -95,16 +95,14 @@ class DeploymentUpdaterSchema < VCAP::Config
             key_file: String
           },
 
-          optional(:copilot) => {
-            enabled: bool,
-            optional(:host) => String,
-            optional(:port) => Integer,
-            optional(:client_ca_file) => String,
-            optional(:client_key_file) => String,
-            optional(:client_chain_file) => String,
-            optional(:temporary_istio_domains) => Array,
+          optional(:kubernetes) => {
+            host_url: String,
+            service_account: {
+              token_file: String,
+            },
+            ca_file: String,
+            workloads_namespace: String,
           },
-
           staging: {
             timeout_in_seconds: Integer,
             auth: {

lib/cloud_controller/config_schemas/worker_schema.rb

@@ -197,20 +197,21 @@ class WorkerSchema < VCAP::Config
             optional(:diego_sync) => { timeout_in_seconds: Integer },
           },
 
-          optional(:copilot) => {
-            enabled: bool,
-            optional(:host) => String,
-            optional(:port) => Integer,
-            optional(:client_ca_file) => String,
-            optional(:client_key_file) => String,
-            optional(:client_chain_file) => String,
-          },
           volume_services_enabled: bool,
           route_services_enabled: bool,
 
           max_labels_per_resource: Integer,
           max_annotations_per_resource: Integer,
           internal_route_vip_range: String,
+
+          optional(:kubernetes) => {
+            host_url: String,
+            service_account: {
+              token_file: String,
+            },
+            ca_file: String,
+            workloads_namespace: String,
+          },
         }
       end
       # rubocop:enable Metrics/BlockLength

lib/cloud_controller/dependency_locator.rb

@@ -5,6 +5,7 @@
 require 'repositories/route_event_repository'
 require 'repositories/user_event_repository'
 require 'kubernetes/kpack_client'
+require 'kubernetes/route_crd_client'
 require 'cloud_controller/rest_controller/object_renderer'
 require 'cloud_controller/rest_controller/paginated_collection_renderer'
 require 'cloud_controller/upload_handler'
@@ -379,6 +380,18 @@ def kpack_client
       Kubernetes::KpackClient.new(kube_client)
     end
 
+    def route_crd_client
+      kubernetes_config = VCAP::CloudController::Config.config.get(:kubernetes)
+      kube_client = Kubernetes::KubeClientBuilder.build({
+        api_group_url: "#{kubernetes_config[:host_url]}/apis/networking.cloudfoundry.org",
+        version: 'v1alpha1',
+        service_account_token: File.open(kubernetes_config[:service_account][:token_file]).read,
+        ca_crt: File.open(kubernetes_config[:ca_file]).read
+      })
+
+      Kubernetes::RouteCrdClient.new(kube_client)
+    end
+
     private
 
     def build_stager_client