kubernetes-deploy 0.6.6 → 0.7.0

data/lib/kubernetes-deploy/runner_task.rb

@@ -2,14 +2,11 @@
 require 'tempfile'
 
 require 'kubernetes-deploy/kubeclient_builder'
-require 'kubernetes-deploy/ui_helpers'
 require 'kubernetes-deploy/kubectl'
 
 module KubernetesDeploy
   class RunnerTask
     include KubeclientBuilder
-    include Kubectl
-    include UIHelpers
 
     class FatalTaskRunError < FatalDeploymentError; end
     class TaskTemplateMissingError < FatalDeploymentError
@@ -18,27 +15,36 @@ module KubernetesDeploy
       end
     end
 
-    def initialize(namespace:, context:, logger: KubernetesDeploy.logger)
+    def initialize(namespace:, context:, logger:)
       @logger = logger
       @namespace = namespace
       @kubeclient = build_v1_kubeclient(context)
       @context = context
     end
 
-    def run(task_template:, entrypoint:, args:, env_vars: [])
-      phase_heading("Validating configuration")
+    def run(*args)
+      run!(*args)
+      true
+    rescue FatalDeploymentError => error
+      @logger.fatal "#{error.class}: #{error.message}"
+      false
+    end
+
+    def run!(task_template:, entrypoint:, args:, env_vars: [])
+      @logger.reset
+      @logger.phase_heading("Validating configuration")
       validate_configuration(task_template, args)
 
-      phase_heading("Fetching task template")
+      @logger.phase_heading("Fetching task template")
       raw_template = get_template(task_template)
 
-      phase_heading("Constructing final pod specification")
+      @logger.phase_heading("Constructing final pod specification")
       rendered_template = build_pod_template(raw_template, entrypoint, args, env_vars)
 
       validate_pod_spec(rendered_template)
 
-      phase_heading("Creating pod")
-      KubernetesDeploy.logger.info("Starting task runner pod: '#{rendered_template.metadata.name}'")
+      @logger.phase_heading("Creating pod")
+      @logger.info("Starting task runner pod: '#{rendered_template.metadata.name}'")
       @kubeclient.create_pod(rendered_template)
     end
 
@@ -60,7 +66,7 @@ module KubernetesDeploy
       end
 
       begin
-        @kubeclient.get_namespace(@namespace)
+        @kubeclient.get_namespace(@namespace) if @namespace.present?
       rescue KubeException => e
         errors << if e.error_code == 404
           "Namespace was not found"
@@ -73,7 +79,7 @@ module KubernetesDeploy
     end
 
     def get_template(template_name)
-      KubernetesDeploy.logger.info(
+      @logger.info(
         "Fetching task runner pod template: '#{template_name}' in namespace: '#{@namespace}'"
       )
 
@@ -89,7 +95,7 @@ module KubernetesDeploy
     end
 
     def build_pod_template(base_template, entrypoint, args, env_vars)
-      KubernetesDeploy.logger.info("Rendering template for task runner pod")
+      @logger.info("Rendering template for task runner pod")
 
       rendered_template = base_template.dup
       rendered_template.kind = 'Pod'
@@ -112,7 +118,7 @@ module KubernetesDeploy
 
       unique_name = rendered_template.metadata.name + "-" + SecureRandom.hex(8)
 
-      KubernetesDeploy.logger.warn("Name is too long, using '#{unique_name[0..62]}'") if unique_name.length > 63
+      @logger.warn("Name is too long, using '#{unique_name[0..62]}'") if unique_name.length > 63
       rendered_template.metadata.name = unique_name[0..62]
       rendered_template.metadata.namespace = @namespace
 
@@ -124,11 +130,8 @@ module KubernetesDeploy
       f.write recursive_to_h(pod).to_json
       f.close
 
-      _out, err, status = Kubectl.run_kubectl(
-        "apply", "--dry-run", "-f", f.path,
-        namespace: @namespace,
-        context: @context
-      )
+      kubectl = Kubectl.new(namespace: @namespace, context: @context, logger: @logger, log_failure_by_default: true)
+      _out, err, status = kubectl.run("apply", "--dry-run", "-f", f.path)
 
       unless status.success?
         raise FatalTaskRunError, "Invalid pod spec: #{err}"

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,6 +68,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,8 +189,10 @@ files:
 - exe/kubernetes-run
 - kubernetes-deploy.gemspec
 - lib/kubernetes-deploy.rb
+- lib/kubernetes-deploy/deferred_summary_logging.rb
 - lib/kubernetes-deploy/ejson_secret_provisioner.rb
 - lib/kubernetes-deploy/errors.rb
+- lib/kubernetes-deploy/formatted_logger.rb
 - lib/kubernetes-deploy/kubeclient_builder.rb
 - lib/kubernetes-deploy/kubeclient_builder/google_friendly_config.rb
 - lib/kubernetes-deploy/kubectl.rb
@@ -192,12 +208,10 @@ files:
 - lib/kubernetes-deploy/kubernetes_resource/pod_template.rb
 - lib/kubernetes-deploy/kubernetes_resource/redis.rb
 - lib/kubernetes-deploy/kubernetes_resource/service.rb
-- lib/kubernetes-deploy/logger.rb
 - lib/kubernetes-deploy/resource_watcher.rb
 - lib/kubernetes-deploy/restart_task.rb
 - lib/kubernetes-deploy/runner.rb
 - lib/kubernetes-deploy/runner_task.rb
-- lib/kubernetes-deploy/ui_helpers.rb
 - lib/kubernetes-deploy/version.rb
 homepage: https://github.com/Shopify/kubernetes-deploy
 licenses:

data/lib/kubernetes-deploy/logger.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-require 'logger'
-
-module KubernetesDeploy
-  module Logger
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def logger=(other)
-        @logger = other
-      end
-
-      def logger
-        @logger ||= begin
-          l = ::Logger.new($stderr)
-          l.level = level_from_env
-          l.formatter = proc do |severity, datetime, _progname, msg|
-            log_text = "[#{severity}][#{datetime}]\t#{msg}"
-            case severity
-            when "FATAL" then "\033[0;31m#{log_text}\x1b[0m\n" # red
-            when "ERROR", "WARN" then "\033[0;33m#{log_text}\x1b[0m\n" # yellow
-            when "INFO" then "\033[0;36m#{log_text}\x1b[0m\n" # blue
-            else "#{log_text}\n"
-            end
-          end
-          l
-        end
-      end
-
-      private
-
-      def level_from_env
-        return ::Logger::DEBUG if ENV["DEBUG"]
-
-        if ENV["LEVEL"]
-          ::Logger.const_get(ENV["LEVEL"].upcase)
-        else
-          ::Logger::INFO
-        end
-      end
-    end
-  end
-end

data/lib/kubernetes-deploy/ui_helpers.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-module KubernetesDeploy
-  module UIHelpers
-    private
-
-    def phase_heading(phase_name)
-      @current_phase ||= 0
-      @current_phase += 1
-      heading = "Phase #{@current_phase}: #{phase_name}"
-      padding = (100.0 - heading.length) / 2
-      KubernetesDeploy.logger.info("")
-      KubernetesDeploy.logger.info("#{'-' * padding.floor}#{heading}#{'-' * padding.ceil}")
-    end
-
-    def log_green(msg)
-      KubernetesDeploy.logger.info("\033[0;32m#{msg}\x1b[0m")
-    end
-  end
-end