Use dedicated methods to fetch k8s config values

- Add methods to VCAP::CloudController::Config
- The methods raise an exception if no k8s api is configured

[#169924422]

Co-authored-by: Matt Royal <mroyal@pivotal.io>
Co-authored-by: Sannidhi Jalukar <sjalukar@pivotal.io>

Author: 2 people

app/actions/app_delete.rb

@@ -56,7 +56,7 @@ def delete(apps, record_event: true)
           logger.info('Deleting associated kpack image')
           kpack_client.delete_image(
             app.guid,
-            VCAP::CloudController::Config.config.get(:kubernetes, :kpack, :builder_namespace)
+            VCAP::CloudController::Config.config.kpack_builder_namespace
           )
         end
       end

app/fetchers/kpack_buildpack_list_fetcher.rb

@@ -5,7 +5,7 @@
 module VCAP::CloudController
   class KpackBuildpackListFetcher
     def fetch_all(message)
-      staging_namespace = VCAP::CloudController::Config.config.get(:kubernetes, :kpack, :builder_namespace)
+      staging_namespace = VCAP::CloudController::Config.config.kpack_builder_namespace
       default_builder = kpack_client.get_custom_builder('cf-default-builder', staging_namespace)
 
       version_map = default_builder.status.builderMetadata.each.with_object({}) do |metadata, h|

app/models/runtime/domain.rb

@@ -150,7 +150,7 @@ def protocols
     private
 
     def k8s_enabled?
-      Config.config.get(:kubernetes, :host_url).present?
+      Config.config.kubernetes_api_configured?
     end
 
     def validate_change_owning_organization(organization)

lib/cloud_controller/backends/stagers.rb

@@ -29,7 +29,7 @@ def validate_process(process)
 
     def stager_for_build(build)
       if build.kpack_lifecycle?
-        return Kpack::Stager.new(**@config.get(:kubernetes, :kpack))
+        return Kpack::Stager.new(**@config.kpack_config)
       end
 
       Diego::Stager.new(@config)

lib/cloud_controller/config.rb

@@ -18,6 +18,9 @@ class Config
     class InvalidConfigPath < StandardError
     end
 
+    class KubernetesApiNotConfigured < StandardError
+    end
+
     class << self
       def load_from_file(file_name, context: :api)
         schema_class = schema_class_for_context(context)
@@ -34,9 +37,7 @@ def schema_class_for_context(context)
         const_get("VCAP::CloudController::ConfigSchemas::#{context.to_s.camelize}Schema")
       end
 
-      def kubernetes_api_configured?
-        !!config.get(:kubernetes, :host_url)
-      end
+      delegate :kubernetes_api_configured?, to: :config
 
       private
 
@@ -124,8 +125,36 @@ def valid_config_path?(keys, some_schema)
       end
     end
 
+    def kubernetes_api_configured?
+      get(:kubernetes, :host_url).present?
+    end
+
+    def kubernetes_config
+      ensure_k8s_api_configured!
+      get(:kubernetes)
+    end
+
+    def kpack_config
+      ensure_k8s_api_configured!
+      get(:kubernetes, :kpack)
+    end
+
+    def kpack_builder_namespace
+      ensure_k8s_api_configured!
+      get(:kubernetes, :kpack, :builder_namespace)
+    end
+
+    def kubernetes_workloads_namespace
+      ensure_k8s_api_configured!
+      get(:kubernetes, :workloads_namespace)
+    end
+
     private
 
+    def ensure_k8s_api_configured!
+      raise KubernetesApiNotConfigured.new('No kubernetes API is configured') unless kubernetes_api_configured?
+    end
+
     def invalid_config_path!(keys)
       raise InvalidConfigPath.new(%("#{keys.join('.')}" is not a valid config key))
     end

lib/cloud_controller/dependency_locator.rb

@@ -369,7 +369,7 @@ def statsd_client
     end
 
     def kpack_client
-      kubernetes_config = VCAP::CloudController::Config.config.get(:kubernetes)
+      kubernetes_config = VCAP::CloudController::Config.config.kubernetes_config
       service_account_token = File.open(kubernetes_config[:service_account][:token_file]).read
       ca_crt = File.open(kubernetes_config[:ca_file]).read
       build_kube_client = Kubernetes::KubeClientBuilder.build({
@@ -390,7 +390,7 @@ def kpack_client
     end
 
     def route_crd_client
-      kubernetes_config = VCAP::CloudController::Config.config.get(:kubernetes)
+      kubernetes_config = VCAP::CloudController::Config.config.kubernetes_config
       kube_client = Kubernetes::KubeClientBuilder.build({
         api_group_url: "#{kubernetes_config[:host_url]}/apis/networking.cloudfoundry.org",
         version: 'v1alpha1',

lib/cloud_controller/opi/stager_client.rb

@@ -117,7 +117,7 @@ def get_lifecycle(staging_details, staging_guid, action_builder)
     end
 
     def staging_completion_callback(staging_details)
-      if !!config.get(:kubernetes, :host_url)
+      if config.kubernetes_api_configured?
         port   = 80
         scheme = 'http'
       else

lib/kubernetes/route_crd_client.rb

@@ -10,7 +10,7 @@ def create_route(route)
       route_crd_hash = {
         metadata: {
           name: route.guid,
-          namespace: VCAP::CloudController::Config.config.get(:kubernetes, :workloads_namespace),
+          namespace: VCAP::CloudController::Config.config.kubernetes_workloads_namespace,
           labels: {
             'app.kubernetes.io/name' => route.guid,
             'app.kubernetes.io/version' => '0.0.0',
@@ -56,7 +56,7 @@ def update_destinations(route)
     end
 
     def delete_route(route)
-      @client.delete_route(route.guid, VCAP::CloudController::Config.config.get(:kubernetes, :workloads_namespace))
+      @client.delete_route(route.guid, VCAP::CloudController::Config.config.kubernetes_workloads_namespace)
     rescue Kubeclient::ResourceNotFoundError
       nil
     rescue Kubeclient::HttpError => e

spec/unit/actions/app_delete_spec.rb

@@ -49,7 +49,7 @@ module VCAP::CloudController
       end
 
       it 'deletes the associated kpack Image' do
-        build_namespace = VCAP::CloudController::Config.config.get(:kubernetes, :kpack, :builder_namespace)
+        build_namespace = VCAP::CloudController::Config.config.kpack_builder_namespace
         expect(kpack_client).to receive(:delete_image).with(app.guid, build_namespace)
         app_delete.delete(app_dataset)
       end