vidar 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e04340c6ac0bb74c7e4cc02270d82418719e215c2b02a86685753c1da903a1c4
-  data.tar.gz: 98bad2e981dbb3c97539e4d3c8bd75c94ce31b6307b6b10f8543dc39e9dc016b
+  metadata.gz: b4e381c4e8e957cf7e8f758dcf56e38d9a1187377b6f7195f3469fc19ebd0ba8
+  data.tar.gz: 6b6da0fca65c144a77aa1fa4b3327f6524335294372b55ce431e7b787452739f
 SHA512:
-  metadata.gz: 808e4b08108033a93a750654d86ab1d7c1a6aaeb3727374b82a666a5ca2ca030fcfc1dcc27301d4788ad558ad0fbaaf1894a353ded3dec705af3f9210a1e3952
-  data.tar.gz: 4cafe1cda4563e5862f8645e03f08845dc5b2f37cfe698d4d71c370a3236d46910ea831ecb2613fa08c62528ee5d2c306ba3cddd7a71357401aa3bd8cab9dfd5
+  metadata.gz: d0ac08a8e695030cfb2d995c3284de04245ef7c0f7dc52eec18c8acab3ce580ea2e1366e1d182caaad4eee15e3543d00d2733233a01049635dcf062b5401f880
+  data.tar.gz: dffd7ebb7160f55fe4ded5edbe78bd794ef1c481c9ab2b8670cadf96eb257c9bdbc426cab1c534e0ee564e92c0190fd87b0cead978794ce8d397f5a7cb8b2c08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (0.4.4)
+    vidar (0.5.0)
       colorize
       faraday
       thor (~> 0.20)
@@ -20,7 +20,7 @@ GEM
     method_source (0.9.2)
     multipart-post (2.1.1)
     parallel (1.17.0)
-    parser (2.6.4.1)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -33,21 +33,21 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec-expectations (3.8.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+    rspec-support (3.8.3)
+    rubocop (0.75.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.0)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
     thor (0.20.3)

data/README.md

@@ -33,18 +33,22 @@ Or install it yourself as:
 image: gcr.io/renofiinfrastructure/vidar 
 # k8s namespace, required
 namespace: borrower 
-# slack webhook url use to send deploy notifications, optional
-slack_webhook_url: https://hooks.slack.com/services/....../....../....../ 
-# github name used to conctruct slack notification content, required when slack_webhook_url is set
+# github name used to build deployment notification content
 github: RenoFi/vidar 
-# Cluster url, used to conctruct slack notification content.
-# Usually it displays k8 workloads filtered to current cluster and namespace. 
-# Similar to all other values it may contain references to others using mustache-like interpolation.
-# Required when slack_webhook_url is set
-cluster_url: "https://console.cloud.google.com/kubernetes/workload?cluster={{cluster_name}}&namespace={{namespace}}" 
-# known k8s cluster_names, used to construct regexp to fetch current cluster from kubectl context
-# Required when slack_webhook_url is set
-cluster_names: "cluster-A|cluster-B" cluster name from kubectl context
+# deployments config per kubectl context, required for `monitor_deploy_status` command 
+deployments:
+  gke_project_us-east4_staging:
+    # Deployment Name
+    name: staging cluster
+    # Color of successful notification, default value: 008800
+    success_color: "00ff00"
+    # Color of failed notification, default value: ff1100
+    failure_color: "ff0000"
+    # Deployment url, e.g. url to gke cluster workloads filtered by namespace
+    # Similar to all other values it may contain references to others using mustache-like interpolation.
+    url: "https://console.cloud.google.com/kubernetes/workload?project=project&namespace={{namespace}}"
+    # Slack webhook url use to send deploy notifications, optional
+    slack_webhook_url: https://hooks.slack.com/services/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
 # docker-compose file, optional, default value: docker-compose.ci.yml
 compose_file: docker-compose.ci.yml
 # default_branch, optional, default value: master

data/bin/release

@@ -5,4 +5,3 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vidar/version'
 
 `bundle && git commit -am "Release #{Vidar::VERSION}" && bundle exec rake build release`
-

data/lib/vidar.rb

@@ -15,6 +15,7 @@ require 'vidar/run'
 require 'vidar/slack_notification'
 require 'vidar/k8s/container_status'
 require 'vidar/k8s/pod_set'
+require 'vidar/deploy_config'
 require 'vidar/deploy_status'
 require 'vidar/cli'
 

data/lib/vidar/cli.rb

@@ -62,7 +62,7 @@ module Vidar
     method_option :revision, required: false
     def deploy
       revision = options[:revision] || Config.get!(:revision)
-      Log.info "Current cluster_name: #{Config.get!(:cluster_name)} ###"
+      Log.info "Current kubectl context: #{Config.get!(:kubectl_context)} ###"
 
       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"
@@ -103,21 +103,19 @@ 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..."
+      Log.info "Current kubectl context: #{Config.get!(:kubectl_context)} ###"
+      Log.info "Checking if all containers in #{Config.get!(:namespace)} namespace(s) are ready..."
+
+      deploy_config = Config.deploy_config
+
+      Log.error "ERROR: could not find deployment config for #{Config.get!(:kubectl_context)} context" unless deploy_config
 
       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_label: Config.get!(:cluster_label),
-        cluster_url:   Config.get!(:cluster_url),
-        success_color: options[:success_color],
-        error_color:   options[:error_color],
+        deploy_config: deploy_config
       )
 
       deploy_status = Vidar::DeployStatus.new(namespace: Config.get!(:namespace))
@@ -129,7 +127,7 @@ module Vidar
         slack_notification.success if slack_notification.configured?
       else
         Log.error "ERROR: Some of containers are errored or not ready"
-        slack_notification.error if slack_notification.configured?
+        slack_notification.failure if slack_notification.configured?
         exit(1)
       end
     end

data/lib/vidar/config.rb

@@ -3,27 +3,12 @@ module Vidar
     DEFAULT_MANIFEST_FILE = "vidar.yml".freeze
 
     DEFAULT_OPTIONS = {
-      compose_file:   -> { "docker-compose.ci.yml" },
-      default_branch: -> { "master" },
-      current_branch: -> { `git rev-parse --abbrev-ref HEAD`.strip.tr("/", "-") },
-      revision:       -> { `git rev-parse HEAD`.strip },
-      revision_name:  -> { `git show --pretty=format:"%s (%h)" -s HEAD`.strip },
-      cluster_name:   -> {
-        cluster_names = get(:cluster_names).to_s
-        current_context = `kubectl config current-context`.strip
-
-        if cluster_names.empty?
-          current_context
-        else
-          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
-      }
+      compose_file:    -> { "docker-compose.ci.yml" },
+      default_branch:  -> { "master" },
+      current_branch:  -> { `git rev-parse --abbrev-ref HEAD`.strip.tr("/", "-") },
+      revision:        -> { `git rev-parse HEAD`.strip },
+      revision_name:   -> { `git show --pretty=format:"%s (%h)" -s HEAD`.strip },
+      kubectl_context: -> { `kubectl config current-context`.strip },
     }.freeze
 
     class << self
@@ -56,6 +41,18 @@ module Vidar
         load unless loaded?
         get(key) || fail(MissingConfigError, key)
       end
+
+      def deploy_config
+        deployments = get(:deployments) || {}
+
+        return nil unless deployments.is_a?(Hash)
+
+        deployment = deployments[get!(:kubectl_context)]
+
+        return nil unless deployment
+
+        DeployConfig.new(deployment.transform_keys!(&:to_sym))
+      end
     end
   end
 end

data/lib/vidar/deploy_config.rb

@@ -0,0 +1,16 @@
+module Vidar
+  class DeployConfig
+    SUCCESS_COLOR = "008800".freeze
+    FAILURE_COLOR = "ff1100".freeze
+
+    attr_reader :name, :url, :success_color, :failure_color, :slack_webhook_url
+
+    def initialize(name:, url:, slack_webhook_url:, success_color: SUCCESS_COLOR, failure_color: FAILURE_COLOR)
+      @name = name
+      @url = url
+      @success_color = success_color
+      @failure_color = failure_color
+      @slack_webhook_url = slack_webhook_url
+    end
+  end
+end

data/lib/vidar/slack_notification.rb

@@ -1,27 +1,14 @@
 module Vidar
   class SlackNotification
-    SUCCESS_COLOR = "good".freeze
-    ERROR_COLOR = "danger".freeze
-
-    def initialize(
-      webhook_url:,
-      github:,
-      revision:,
-      revision_name:,
-      cluster_label:,
-      cluster_url:,
-      success_color: nil,
-      error_color: nil
-    )
-
-      @webhook_url     = webhook_url
+    def initialize(github:, revision:, revision_name:, deploy_config:)
       @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
+      @deploy_name     = deploy_config.name
+      @deploy_url      = deploy_config.url
+      @success_color   = deploy_config.success_color
+      @failure_color   = deploy_config.failure_color
+      @webhook_url     = deploy_config.slack_webhook_url
       @connection      = Faraday.new
     end
 
@@ -29,13 +16,13 @@ module Vidar
       !webhook_url.to_s.empty?
     end
 
-    def error
-      message = "Failed deploy of #{github_link} to #{cluster_link} :fire: <!channel>"
-      perform_with data(message: message, color: ERROR_COLOR)
+    def failure
+      message = "Failed deploy of #{github_link} to #{deploy_link} :fire: <!channel>"
+      perform_with data(message: message, color: failure_color)
     end
 
     def success
-      message = "Successful deploy of #{github_link} to #{cluster_link}"
+      message = "Successful deploy of #{github_link} to #{deploy_link}"
       perform_with data(message: message, color: success_color)
     end
 
@@ -49,10 +36,9 @@ module Vidar
 
     private
 
-    attr_reader :webhook_url, :github,
-      :revision, :revision_name,
-      :cluster_label, :cluster_url,
-      :success_color, :error_color,
+    attr_reader :github, :revision, :revision_name,
+      :deploy_name, :deploy_url, :webhook_url,
+      :success_color, :failure_color,
       :connection
 
     def data(message:, color:)
@@ -77,8 +63,8 @@ module Vidar
       "<#{github_url}|#{revision_name}>"
     end
 
-    def cluster_link
-      "<#{cluster_url}|#{cluster_label}>"
+    def deploy_link
+      "<#{deploy_url}|#{deploy_name}>"
     end
   end
 end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -178,6 +178,7 @@ files:
 - lib/vidar.rb
 - lib/vidar/cli.rb
 - lib/vidar/config.rb
+- lib/vidar/deploy_config.rb
 - lib/vidar/deploy_status.rb
 - lib/vidar/interpolation.rb
 - lib/vidar/k8s/container_status.rb