vidar 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e85909f2a0b69d1aa3fbaf1e8e88dbe00a65f4464c78206b88affe58d9a0737
-  data.tar.gz: e9c6deb5b510a19e0f0e24d1f674477f33ce072f07117757b098d13ed20dbd08
+  metadata.gz: fbf6458e4bf0f50913580e72f32a2b9fa20dff7d6775a4cf0f3af209f5c7b0a9
+  data.tar.gz: b4fdcdf35ca12932c6a867c18d9f769c58dcad5ad4cc899585cbb2322e0e3db1
 SHA512:
-  metadata.gz: c8f6d696c5d58262473dd8a62b96cd942d8246de5165e5477be70f3b4dfd371b9f4a86da597534026d2beaeafe249d223cb4963837d5e820a88dc3ab9fcd365e
-  data.tar.gz: 426f39c791e5cabb442f1a5a433c0bce5849cc4fb2cf59c82ba446b66e8528bafe3e714c525af5dabe7a4d2bbf1a6c0e3a9dbe0fb34c108b0cdda5fb2f3938c5
+  metadata.gz: cd6382056fb7fca1864adf9110a7fea122f20b785ecd590219cbf62968a4ab1f88163955df3c1fd48e185620f429cb89a9b863ac6d82f6087566076d454b897e
+  data.tar.gz: e3a4ff265a97cc941282f20ebd37325530e2af079f432c16f207e295e7c14ea18ae62aeb93fb69ff74c4a5cbd4190b8bed2bd8c9ab8c89827415a73afb7b93e9

data/.gitignore

@@ -12,3 +12,4 @@
 
 # Cached rubocop config files
 .rubocop-http*
+vidar.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (0.3.4)
+    vidar (0.4.0)
       colorize
       faraday
       thor (~> 0.20)
@@ -10,6 +10,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    awesome_print (1.8.0)
     coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
@@ -56,6 +57,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   bundler
   pry
   rake

data/lib/vidar.rb

@@ -14,7 +14,7 @@ require 'vidar/log'
 require 'vidar/run'
 require 'vidar/slack_notification'
 require 'vidar/k8s/container_status'
-require 'vidar/k8s/pods'
+require 'vidar/k8s/pod_set'
 require 'vidar/deploy_status'
 require 'vidar/cli'
 

data/lib/vidar/cli.rb

@@ -59,14 +59,11 @@ module Vidar
     end
 
     desc "deploy", "Performs k8s deployment with deploy hook"
-    method_option :revision, default: nil
+    method_option :revision, required: false
     def deploy
       revision = options[:revision] || Config.get!(:revision)
       Log.info "Current cluster_name: #{Config.get!(:cluster_name)} ###"
 
-      Log.info "Set kubectl image..."
-      Run.kubectl "set image deployments,cronjobs *=#{Config.get!(:image)}:#{revision} --all"
-
       Log.info "Looking for deploy hook..."
       template_name, error, status = Open3.capture3 "kubectl get cronjob deploy-hook-template -n #{Config.get!(:namespace)} -o name --ignore-not-found=true"
 
@@ -76,12 +73,24 @@ module Vidar
         else
           Log.info "Executing deploy hook #{template_name.strip!}..."
           Run.kubectl "delete job deploy-hook --ignore-not-found=true"
+          Run.kubectl "set image cronjobs deploy-hook-template=#{Config.get!(:image)}:#{revision} --all"
           Run.kubectl "create job deploy-hook --from=#{template_name}"
+
+          deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace), filter: "deploy-hook")
+          deploy_status.wait_until_completed
+
+          unless deploy_status.success?
+            Log.error "Error running deploy hook template"
+            exit(1)
+          end
         end
       else
         Log.info "Error getting deploy hook template: #{error}"
         exit(1)
       end
+
+      Log.info "Set kubectl image..."
+      Run.kubectl "set image deployments,cronjobs *=#{Config.get!(:image)}:#{revision} --all"
     end
 
     desc "release", "Builds and publishes docker images"
@@ -97,11 +106,11 @@ module Vidar
     method_option :success_color, required: false
     method_option :error_color, required: false
     def monitor_deploy_status
-      Log.info "Current cluster_name: #{Config.get!(:cluster_name)} ###"
+      Log.info "Current cluster_name: #{Config.get!(:cluster_name)}"
       Log.info "Checking is all containers on #{Config.get!(:cluster_name)} in #{Config.get!(:namespace)} are ready..."
 
       slack_notification = SlackNotification.new(
-        webhook_url:   Config.get!(:slack_webhook_url),
+        webhook_url:   Config.get(:slack_webhook_url),
         github:        Config.get!(:github),
         revision:      Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
@@ -111,13 +120,15 @@ module Vidar
         error_color:   options[:error_color],
       )
 
-      ok = Vidar::DeployStatus.new(Config.get!(:namespace)).ok?
+      deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace))
+
+      deploy_status.wait_until_completed
 
-      if ok
-        Log.info "OK: All containers are ready."
+      if deploy_status.success?
+        Log.info "OK: All containers are ready"
         slack_notification.success if slack_notification.configured?
       else
-        Log.error "ERROR: Some of containers are not ready."
+        Log.error "ERROR: Some of containers are errored or not ready"
         slack_notification.error if slack_notification.configured?
         exit(1)
       end

data/lib/vidar/deploy_status.rb

@@ -4,32 +4,39 @@ module Vidar
     SLEEP = 10
     MAX_TRIES = 30
 
-    attr_reader :namespace
+    attr_reader :namespace, :filter, :max_tries
 
-    def initialize(namespace)
+    def initialize(namespace:, filter: nil, max_tries: MAX_TRIES)
       @namespace = namespace
+      @filter = filter
+      @max_tries = max_tries
     end
 
-    def error?
-      any_errors = false
+    def wait_until_completed
       tries = 0
 
       sleep(INITIAL_SLEEP)
 
-      until K8s::Pods.new(namespace).all_ready?
+      until pod_set.deployed?
         tries += 1
         sleep(SLEEP)
-        if tries > MAX_TRIES
-          any_errors = true
+        if tries > max_tries
           break
         end
       end
+    end
+
+    def success?
+      return false unless last_pod_set
+      last_pod_set.success?
+    end
 
-      any_errors
+    def last_pod_set
+      @pod_set
     end
 
-    def ok?
-      !error?
+    def pod_set
+      @pod_set = K8s::PodSet.new(namespace: namespace, filter: filter)
     end
   end
 end

data/lib/vidar/k8s/container_status.rb

@@ -1,20 +1,31 @@
 module Vidar
   module K8s
     class ContainerStatus
-      attr_reader :data, :state, :namespace
+      JOB_KIND = "Job".freeze
+
+      attr_reader :data, :state, :namespace, :kind
 
       def initialize(data)
-        @data = data
-        @state = data["state"]
+        @data      = data
+        @state     = data["state"]
         @namespace = data["namespace"]
+        @kind      = data["kind"]
       end
 
       def name
         data["name"]
       end
 
-      def ok?
-        (ready? && running?) || terminated_completed?
+      def deployed?
+        return terminated? if job?
+
+        ready? && running?
+      end
+
+      def success?
+        return terminated_completed? if job?
+
+        ready? && running?
       end
 
       def print
@@ -37,13 +48,13 @@ module Vidar
             [ColorizedString["Not ready"].light_red, "Started at: #{running_started_at}"]
           end
         elsif terminated_completed?
-          [ColorizedString["Terminated/Completed"].light_green, "Finished at: #{terminated_finished_at}"]
+          [ColorizedString["Terminated/Completed"].light_green, terminated_finished_at ? "Finished at: #{terminated_finished_at}" : ""]
         elsif terminated_error?
-          [ColorizedString["Terminated/Error"].light_red]
+          [ColorizedString["Terminated/Error"].light_red, ""]
         elsif waiting?
-          [ColorizedString["Waiting"].light_green]
+          [ColorizedString["Waiting"].light_green, ""]
         else
-          [ColorizedString[state.inspect].light_red]
+          [ColorizedString[state.inspect].light_red, ""]
         end
       end
 
@@ -63,6 +74,10 @@ module Vidar
         state.dig("running", "startedAt")
       end
 
+      def terminated?
+        !state["terminated"].nil?
+      end
+
       def terminated_completed?
         state.dig("terminated", "reason") == "Completed" || state.dig("terminated", "exitCode") == 0
       end
@@ -74,6 +89,10 @@ module Vidar
       def terminated_error?
         state.dig("terminated", "reason") == "Error" || state.dig("terminated", "exitCode")
       end
+
+      def job?
+        kind == JOB_KIND
+      end
     end
   end
 end

data/lib/vidar/k8s/pod_set.rb

@@ -0,0 +1,72 @@
+module Vidar
+  module K8s
+    class PodSet
+      def initialize(namespace:, filter: nil)
+        @namespace = namespace
+        @filter = filter
+      end
+
+      def deployed?
+        if items.empty?
+          Log.error "Could not fetch pod list"
+          return false
+        end
+
+        Log.line
+
+        container_statuses.each(&:print)
+
+        Log.line
+
+        container_statuses.all?(&:deployed?)
+      end
+
+      def success?
+        container_statuses.all?(&:success?)
+      end
+
+      private
+
+      attr_reader :namespace, :filter
+
+      def items
+        @items ||= begin
+          json = JSON.parse(kubectl_get.strip)
+          json["items"] || []
+        end
+      end
+
+      def kubectl_get
+        if namespace == "all"
+          `kubectl get pods --all-namespaces -o json`
+        else
+          `kubectl get pods -n #{namespace} -o json`
+        end
+      end
+
+      def container_statuses
+        return all_container_statuses unless filter
+
+        all_container_statuses.select { |cs| cs.name.to_s.include?(filter) }
+      end
+
+      def all_container_statuses
+        @all_container_statuses ||= container_statuses_data.map { |status| ContainerStatus.new(status) }
+      end
+
+      def container_statuses_data
+        items.map do |i|
+          owner_references = i.dig("metadata", "ownerReferences") || []
+          kind             = (owner_references[0] || {})["kind"]
+          namespace        = i.dig("metadata", "namespace")
+          statuses         = i.dig("status", "containerStatuses") || []
+          statuses.each do |s|
+            s["namespace"] = namespace
+            s["kind"] = kind
+          end
+          statuses
+        end.flatten
+      end
+    end
+  end
+end

data/lib/vidar/log.rb

@@ -6,11 +6,11 @@ module Vidar
       end
 
       def info(text, fill_with = "#")
-        puts ColorizedString["#{fill_with} #{text} ".ljust(100, fill_with)].colorize(:light_green)
+        puts ColorizedString["#{fill_with} #{text} ".ljust(124, fill_with)].colorize(:light_green)
       end
 
       def error(text, fill_with = "#")
-        puts ColorizedString["#{fill_with} #{text} ".ljust(100, fill_with)].colorize(:light_red)
+        puts ColorizedString["#{fill_with} #{text} ".ljust(124, fill_with)].colorize(:light_red)
       end
     end
   end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/vidar.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday'
   spec.add_dependency 'thor', '~> 0.20'
 
+  spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +180,7 @@ files:
 - lib/vidar/deploy_status.rb
 - lib/vidar/interpolation.rb
 - lib/vidar/k8s/container_status.rb
-- lib/vidar/k8s/pods.rb
+- lib/vidar/k8s/pod_set.rb
 - lib/vidar/log.rb
 - lib/vidar/run.rb
 - lib/vidar/slack_notification.rb

data/lib/vidar/k8s/pods.rb

@@ -1,56 +0,0 @@
-module Vidar
-  module K8s
-    class Pods
-      def initialize(namespace)
-        @namespace = namespace
-      end
-
-      def all_ready?
-        if items.empty?
-          Log.error "Could not fetch pod list"
-          return false
-        end
-
-        Log.line
-
-        container_statuses.each(&:print)
-
-        Log.line
-
-        container_statuses.all?(&:ok?)
-      end
-
-      private
-
-      attr_reader :namespace
-
-      def items
-        @items ||= begin
-          json = JSON.parse(kubectl_get.strip)
-          json["items"] || []
-        end
-      end
-
-      def kubectl_get
-        if namespace == 'all'
-          `kubectl get pods --all-namespaces -o json`
-        else
-          `kubectl get pods -n #{namespace} -o json`
-        end
-      end
-
-      def container_statuses
-        @container_statuses ||= container_statuses_data.map { |status| ContainerStatus.new(status) }
-      end
-
-      def container_statuses_data
-        items.map do |i|
-          namespace = i.dig("metadata", "namespace")
-          statuses = i.dig("status", "containerStatuses") || []
-          statuses.each { |s| s["namespace"] = namespace }
-          statuses
-        end.flatten
-      end
-    end
-  end
-end