vidar 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd260ce9a8c7fb23a3e42a72af992f07c21d0ef5ffe30a3b96af32ffc8569d1b
-  data.tar.gz: 8cc9bf1d9068b7ac59e0b001a5f5f4fc45bc25f13baae05602e91697dcd9364c
+  metadata.gz: 105e2f348c313725b7a92f6ce260aea96c34a99c4aeeb1027a07b309d1d4448d
+  data.tar.gz: ca750b51ab3e4d8d25f2fc27a742909c3de858f622ffd99354af0a83f58ffc49
 SHA512:
-  metadata.gz: dec4d553518f687ea22405189939222ebc442b5ffac32c800aa7610c8ad81a3352f621a8da065b3fef14529b45463266016f2a14403fa84cf02098431e401361
-  data.tar.gz: ab7f8daf3a3ad6754280b23a004599e91ce4a6d52381b13ca7feee7d3fb68f17296a7243a5329c69326d658a967177446773863d9fba24070303dc0e2a8091bd
+  metadata.gz: b1da1774c90625da8378f25182897c76cb91a5cb7e61663d9fab87ac124892cb476f8e772ebcd9af6a290a187606e37f9af16c75b313ddcd525de2d9ff42349b
+  data.tar.gz: 3332d5453505935187240eaef57c5191f208cb6c057dbce400b6330cc0ee07f4b0a1ce876c225fd3ae821c5d2f2fe49bbd3eb75d4555d1a598974f0cfe845937

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (0.3.0)
+    vidar (0.3.2)
       colorize
       faraday
       thor (~> 0.20)
@@ -13,7 +13,7 @@ GEM
     coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
-    faraday (0.15.4)
+    faraday (0.16.2)
       multipart-post (>= 1.2, < 3)
     jaro_winkler (1.5.3)
     method_source (0.9.2)

data/lib/vidar.rb

@@ -15,6 +15,7 @@ require 'vidar/run'
 require 'vidar/slack_notification'
 require 'vidar/k8s/container_status'
 require 'vidar/k8s/pods'
+require 'vidar/deploy_status'
 require 'vidar/cli'
 
 module Vidar

data/lib/vidar/cli.rb

@@ -94,39 +94,32 @@ module Vidar
     end
 
     desc "monitor_deploy_status", "Checks is deployment has finished and sends post-deploy notification"
+    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 "Checking is all containers on #{Config.get!(:cluster_name)} in #{Config.get!(:namespace)} are ready..."
 
-      sleep(2)
-      error = false
-      tries = 0
-      max_tries = 30
-      until K8s::Pods.new(Config.get!(:namespace)).all_ready?
-        tries += 1
-        sleep(10)
-        if tries > max_tries
-          error = true
-          break
-        end
-      end
-
       slack_notification = SlackNotification.new(
         webhook_url:   Config.get!(:slack_webhook_url),
         github:        Config.get!(:github),
         revision:      Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
-        cluster_name:  Config.get!(:cluster_name),
-        cluster_url:   Config.get!(:cluster_url)
+        cluster_label: Config.get!(:cluster_label),
+        cluster_url:   Config.get!(:cluster_url),
+        success_color: options[:success_color],
+        error_color:   options[:error_color],
       )
 
-      if error
+      ok = Vidar::DeployStatus.new(Config.get!(:namespace)).ok?
+
+      if ok
+        Log.info "OK: All containers are ready."
+        slack_notification.success if slack_notification.configured?
+      else
         Log.error "ERROR: Some of containers are not ready."
         slack_notification.error if slack_notification.configured?
         exit(1)
-      else
-        Log.info "OK: All containers are ready."
-        slack_notification.success if slack_notification.configured?
       end
     end
   end

data/lib/vidar/config.rb

@@ -18,6 +18,11 @@ module Vidar
           names_in_context = current_context.scan(Regexp.new(cluster_names))
           names_in_context.flatten.first || current_context
         end
+      },
+      cluster_label:  -> {
+        labels = get(:cluster_labels) || {}
+        name = get(:cluster_name)
+        labels[name] || name
       }
     }.freeze
 
@@ -38,19 +43,12 @@ module Vidar
         @loaded
       end
 
-      def cluster_name
-        cluster_names = get(:cluster_names).to_s
-        current_context = `kubectl config current-context`.strip
-
-        return current_context if cluster_names.empty?
-
-        names_in_context = current_context.scan(Regexp.new(cluster_names))
-        names_in_context.flatten.first || current_context
-      end
-
       def get(key)
         load unless loaded?
         value = @data[key.to_s] || DEFAULT_OPTIONS[key.to_sym]&.call
+
+        return value unless value.is_a?(String)
+
         Vidar::Interpolation.call(value, self)
       end
 

data/lib/vidar/deploy_status.rb

@@ -0,0 +1,34 @@
+module Vidar
+  class DeployStatus
+    INITIAL_SLEEP = 2
+    SLEEP = 10
+    MAX_TRIES = 30
+
+    attr_reader :namespace
+
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def error?
+      any_errors = false
+
+      sleep(INITIAL_SLEEP)
+
+      until K8s::Pods.new(namespace).all_ready?
+        tries += 1
+        sleep(SLEEP)
+        if tries > MAX_TRIES
+          any_errors = true
+          break
+        end
+      end
+
+      any_errors
+    end
+
+    def ok?
+      !error?
+    end
+  end
+end

data/lib/vidar/k8s/pods.rb

@@ -13,9 +13,7 @@ module Vidar
 
         Log.line
 
-        container_statuses.each do |container_status|
-          container_status.print
-        end
+        container_statuses.each(&:print)
 
         Log.line
 

data/lib/vidar/slack_notification.rb

@@ -3,14 +3,26 @@ module Vidar
     SUCCESS_COLOR = "good".freeze
     ERROR_COLOR = "danger".freeze
 
-    def initialize(webhook_url:, github:, revision:, revision_name:, cluster_name:, cluster_url:)
-      @webhook_url   = webhook_url
-      @github        = github
-      @revision      = revision
-      @revision_name = revision_name
-      @cluster_name  = cluster_name
-      @cluster_url   = cluster_url
-      @connection    = Faraday.new
+    def initialize(
+      webhook_url:,
+      github:,
+      revision:,
+      revision_name:,
+      cluster_label:,
+      cluster_url:,
+      success_color: nil,
+      error_color: nil
+    )
+
+      @webhook_url     = webhook_url
+      @github          = github
+      @revision        = revision
+      @revision_name   = revision_name
+      @cluster_label   = cluster_label
+      @cluster_url     = cluster_url
+      @success_color   = success_color || SUCCESS_COLOR
+      @error_color     = error_color || ERROR_COLOR
+      @connection      = Faraday.new
     end
 
     def configured?
@@ -24,7 +36,7 @@ module Vidar
 
     def success
       message = "Successful deploy of #{github_link} to #{cluster_link}"
-      perform_with data(message: message, color: SUCCESS_COLOR)
+      perform_with data(message: message, color: success_color)
     end
 
     def perform_with(data)
@@ -37,7 +49,11 @@ module Vidar
 
     private
 
-    attr_reader :webhook_url, :github, :revision, :revision_name, :cluster_name, :cluster_url, :connection
+    attr_reader :webhook_url, :github,
+      :revision, :revision_name,
+      :cluster_label, :cluster_url,
+      :success_color, :error_color,
+      :connection
 
     def data(message:, color:)
       {
@@ -62,7 +78,7 @@ module Vidar
     end
 
     def cluster_link
-      "<#{cluster_url}|#{cluster_name}>"
+      "<#{cluster_url}|#{cluster_label}>"
     end
   end
 end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -163,6 +163,7 @@ files:
 - lib/vidar.rb
 - lib/vidar/cli.rb
 - lib/vidar/config.rb
+- lib/vidar/deploy_status.rb
 - lib/vidar/interpolation.rb
 - lib/vidar/k8s/container_status.rb
 - lib/vidar/k8s/pods.rb