Use Kubernetes::ApiClient to communicate with k8s API

- Rename KpackClient => ApiClient and add route methods
- Rename RouteCrdClient => RouteResourceManager to reflect that it is
  not an API client
- RouteResourceManager no longer handles API error translation, since
  ApiClient does that for it

[#173630293]

Co-authored-by: Matt Royal <mroyal@pivotal.io>
Co-authored-by: Jaskanwal Pawar <jpawar@pivotal.io>
Co-authored-by: Nat Bennett <nbennett@pivotal.io>

Author: 3 people

app/actions/app_delete.rb

@@ -54,7 +54,7 @@ def delete(apps, record_event: true)
 
         if VCAP::CloudController::Config.kubernetes_api_configured?
           logger.info('Deleting associated kpack image')
-          kpack_client.delete_image(
+          k8s_api_client.delete_image(
             app.guid,
             VCAP::CloudController::Config.config.kpack_builder_namespace
           )
@@ -68,8 +68,8 @@ def delete_without_event(apps)
 
     private
 
-    def kpack_client
-      CloudController::DependencyLocator.instance.kpack_client
+    def k8s_api_client
+      CloudController::DependencyLocator.instance.k8s_api_client
     end
 
     def record_audit_event(app)

app/actions/build_create.rb

@@ -155,10 +155,6 @@ def stagers
       CloudController::DependencyLocator.instance.stagers
     end
 
-    def kpack_client
-      CloudController::DependencyLocator.instance.kpack_client.client
-    end
-
     def staging_in_progress!
       raise StagingInProgress
     end

app/actions/route_create.rb

@@ -32,7 +32,7 @@ def create(message:, space:, domain:, manifest_triggered: false)
       )
 
       if VCAP::CloudController::Config.kubernetes_api_configured?
-        route_crd_client.create_route(route)
+        route_resource_manager.create_route(route)
       end
 
       route
@@ -66,8 +66,8 @@ def router_group(domain)
       @router_group ||= domain.router_group
     end
 
-    def route_crd_client
-      @route_crd_client ||= CloudController::DependencyLocator.instance.route_crd_client
+    def route_resource_manager
+      @route_resource_manager ||= CloudController::DependencyLocator.instance.route_resource_manager
     end
 
     def validation_error!(error, host, path, port, space, domain)

app/actions/route_mapping_delete.rb

@@ -31,16 +31,16 @@ def delete(route_mappings)
           end
 
           if VCAP::CloudController::Config.kubernetes_api_configured?
-            route_crd_client.update_destinations(route_mapping.route.reload)
+            route_resource_manager.update_destinations(route_mapping.route.reload)
           end
         end
       end
     end
 
     private
 
-    def route_crd_client
-      CloudController::DependencyLocator.instance.route_crd_client
+    def route_resource_manager
+      CloudController::DependencyLocator.instance.route_resource_manager
     end
 
     def event_repository

app/actions/update_route_destinations.rb

@@ -98,7 +98,7 @@ def update(route, to_add, to_delete, user_audit_info, manifest_triggered)
         route.reload
 
         if VCAP::CloudController::Config.kubernetes_api_configured?
-          route_crd_client.update_destinations(route)
+          route_resource_manager.update_destinations(route)
         end
 
         route
@@ -166,8 +166,8 @@ def destination_to_mapping_hash(route, destination)
         }
       end
 
-      def route_crd_client
-        CloudController::DependencyLocator.instance.route_crd_client
+      def route_resource_manager
+        CloudController::DependencyLocator.instance.route_resource_manager
       end
 
       def validate_unique!(new_route_mappings)

app/actions/v2/route_create.rb

@@ -15,7 +15,7 @@ def create_route(route_hash:)
         end
 
         if VCAP::CloudController::Config.kubernetes_api_configured?
-          route_crd_client.create_route(route)
+          route_resource_manager.create_route(route)
         end
 
         route
@@ -25,8 +25,8 @@ def create_route(route_hash:)
 
       attr_reader :access_validator
 
-      def route_crd_client
-        @route_crd_client ||= CloudController::DependencyLocator.instance.route_crd_client
+      def route_resource_manager
+        @route_resource_manager ||= CloudController::DependencyLocator.instance.route_resource_manager
       end
     end
   end

app/actions/v2/route_mapping_create.rb

@@ -49,7 +49,7 @@ def add
         end
 
         if VCAP::CloudController::Config.kubernetes_api_configured?
-          route_crd_client.update_destinations(route_mapping.route)
+          route_resource_manager.update_destinations(route_mapping.route)
         end
 
         route_mapping
@@ -65,8 +65,8 @@ 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
+      def route_resource_manager
+        @route_resource_manager ||= CloudController::DependencyLocator.instance.route_resource_manager
       end
 
       def requested_port

app/fetchers/kpack_buildpack_list_fetcher.rb

@@ -6,7 +6,7 @@ module VCAP::CloudController
   class KpackBuildpackListFetcher
     def fetch_all(message)
       staging_namespace = VCAP::CloudController::Config.config.kpack_builder_namespace
-      default_builder = kpack_client.get_custom_builder('cf-default-builder', staging_namespace)
+      default_builder = k8s_api_client.get_custom_builder('cf-default-builder', staging_namespace)
 
       version_map = default_builder.status.builderMetadata.each.with_object({}) do |metadata, h|
         h[metadata.id] = metadata.version
@@ -40,8 +40,8 @@ def fetch_all(message)
 
     private
 
-    def kpack_client
-      @kpack_client ||= CloudController::DependencyLocator.instance.kpack_client
+    def k8s_api_client
+      @k8s_api_client ||= CloudController::DependencyLocator.instance.k8s_api_client
     end
 
     class KpackBuildpack

app/models/runtime/route.rb

@@ -248,7 +248,7 @@ def around_destroy
         ProcessRouteHandler.new(app).notify_backend_of_route_update
       end
       if VCAP::CloudController::Config.kubernetes_api_configured?
-        CloudController::DependencyLocator.instance.route_crd_client.delete_route(self)
+        CloudController::DependencyLocator.instance.route_resource_manager.delete_route(self)
       end
     end
 

lib/cloud_controller/config_schemas/api_schema.rb

@@ -362,21 +362,22 @@ class ApiSchema < VCAP::Config
 
           internal_route_vip_range: String,
 
+          default_app_lifecycle: String,
+          custom_metric_tag_prefix_list: Array,
+
           optional(:kubernetes) => {
             host_url: String,
             service_account: {
               token_file: String,
             },
             ca_file: String,
             workloads_namespace: String,
-            optional(:kpack) => {
+            optional(:kpack) => { # TODO: this isn't optional in practice
               builder_namespace: String,
               registry_service_account_name: String,
               registry_tag_base: String,
             }
           },
-          default_app_lifecycle: String,
-          custom_metric_tag_prefix_list: Array,
         }
       end
       # rubocop:enable Metrics/BlockLength