Use TaskConfigValidator for RunnerTask

lib/kubernetes-deploy/runner_task.rb

@@ -35,7 +35,7 @@ def run!(task_template:, entrypoint:, args:, env_vars: [], verify_result: true)
       @logger.reset
 
       @logger.phase_heading("Initializing task")
-      validate_configuration(task_template, args)
+      verify_config!(task_template, args)
       pod = build_pod(task_template, entrypoint, args, env_vars, verify_result)
       validate_pod(pod)
 
@@ -107,41 +107,26 @@ def record_status_once(pod)
       @logger.summary.add_paragraph(warning)
     end
 
-    def validate_configuration(task_template, args)
+    def verify_config!(task_template, args)
       @logger.info("Validating configuration")
       errors = []
 
       if task_template.blank?
         errors << "Task template name can't be nil"
       end
 
-      if @namespace.blank?
-        errors << "Namespace can't be empty"
-      end
-
       if args.blank?
         errors << "Args can't be nil"
       end
 
-      begin
-        kubeclient.get_namespace(@namespace) if @namespace.present?
-        @logger.info("Using namespace '#{@namespace}' in context '#{@context}'")
-
-      rescue Kubeclient::ResourceNotFoundError
-        errors << "Namespace was not found"
-      rescue Kubeclient::HttpError
-        errors << "Could not connect to kubernetes cluster"
-      rescue KubernetesDeploy::KubeclientBuilder::ContextMissingError
-        errors << "Could not connect to kubernetes cluster - context invalid"
-      end
-
-      unless errors.empty?
+      task_config_validator = TaskConfigValidator.new(@task_config, kubectl, kubeclient_builder)
+      unless task_config_validator.valid?
         @logger.summary.add_action("Configuration invalid")
-        @logger.summary.add_paragraph(errors.map { |err| "- #{err}" }.join("\n"))
-        raise TaskConfigurationError, "Configuration invalid: #{errors.join(', ')}"
+        @logger.summary.add_paragraph([task_config_validator.errors + errors].map { |err| "- #{err}" }.join("\n"))
+        raise KubernetesDeploy::TaskConfigurationError
       end
 
-      TaskConfigValidator.new(@task_config, kubectl, kubeclient_builder, only: [:validate_server_version]).valid?
+      @logger.info("Using namespace '#{@namespace}' in context '#{@context}'")
     end
 
     def get_template(template_name)

test/integration-serial/serial_task_run_test.rb

@@ -13,7 +13,6 @@ def test_run_without_verify_result_fails_if_pod_was_not_created
     # Sketchy, but stubbing the kubeclient doesn't work (and wouldn't be concurrency-friendly)
     # Finding a way to reliably trigger a create failure would be much better, if possible
     mock = mock()
-    mock.expects(:get_namespace)
     template = kubeclient.get_pod_template('hello-cloud-template-runner', @namespace)
     mock.expects(:get_pod_template).returns(template)
     mock.expects(:create_pod).raises(Kubeclient::HttpError.new("409", "Pod with same name exists", {}))

test/integration/runner_task_test.rb

@@ -179,15 +179,15 @@ def test_run_bang_raises_exceptions_as_well_as_printing_failure
   end
 
   def test_run_fails_if_context_is_invalid
-    task_runner = build_task_runner(context: "missing")
+    task_runner = build_task_runner(context: "unknown")
     assert_task_run_failure(task_runner.run(run_params))
 
     assert_logs_match_all([
       "Initializing task",
       "Validating configuration",
       "Result: FAILURE",
       "Configuration invalid",
-      "- Could not connect to kubernetes cluster - context invalid",
+      "Context unknown missing from your kubeconfig file(s)",
     ], in_order: true)
   end
 
@@ -200,7 +200,7 @@ def test_run_fails_if_namespace_is_missing
       "Validating configuration",
       "Result: FAILURE",
       "Configuration invalid",
-      "- Namespace was not found",
+      "Could not find Namespace:",
     ], in_order: true)
   end