kubernetes-deploy 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847d8896587cd1782e7fcda36d6f73afb9f52989
-  data.tar.gz: 359192fb71943bd4dd916436b12225c798ae2e70
+  metadata.gz: d1e66d28cabf4ab39da9f1418817e5466ea2e73f
+  data.tar.gz: 69967786f96afae72c074a49c44763e1e0377d1e
 SHA512:
-  metadata.gz: 061ddcbfd5009eac42f43c489b1d6ab471e53eea281666d76919d1de91f4fb8ad20e15b9e8c2d7bb1e2c2dd242640d69926355a0efe941a1556fb70ee32fa867
-  data.tar.gz: 8f7d8be0baa2d6b265cbffdc269fc8b532cbc27a6825a6eda0f039a3f5355347a2a7d17258bae629e1904ed3451c7e47c48e27fd68f8e5df8fe82f4493e2a275
+  metadata.gz: 1aba4d518ff8cb0afad70fd9d5a2710ee6696f02c06fe497907a1ac593fc94191e970b1afabe119032dbf5ad361dd9fc06255d1ca817748e36d9c66b581037e9
+  data.tar.gz: d4213a7380ac484572837a8723713ebfb8cc93448cab122e89a80c55d36bd0399397f8d93e8a27b858fae34dcaa6a4783a65d220e1b561079f5c323eb890105d

data/.gitignore

@@ -10,3 +10,5 @@
 
 # Ignore RuboCop cache
 .rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml
+
+.byebug_history

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'pry'
 gem 'rubocop'
 gem 'timecop'
+gem 'byebug'

data/exe/kubernetes-deploy

@@ -9,7 +9,18 @@ skip_wait = false
 template_dir = nil
 allow_protected_ns = false
 prune = true
+bindings = {}
+
 ARGV.options do |opts|
+  opts.on("--bindings=BINDINGS", Array, "k1=v1,k2=v2") do |binds|
+    bindings = binds.each_with_object({}) do |bind, acc|
+      k,v = bind.split('=')
+      raise "key for value #{v} is blank!" if k.blank?
+      raise "value for key #{k} is blank!" if v.blank?
+      acc[k] = v
+    end
+  end
+
   opts.on("--skip-wait") { skip_wait = true }
   opts.on("--allow-protected-ns") { allow_protected_ns = true }
   opts.on("--no-prune") { prune = false }
@@ -41,6 +52,7 @@ KubernetesDeploy::Runner.with_friendly_errors do
     wait_for_completion: !skip_wait,
     allow_protected_ns: allow_protected_ns,
     prune: prune,
+    bindings: bindings
   )
   runner.run
 end

data/lib/kubernetes-deploy.rb

@@ -5,42 +5,10 @@ require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/string/strip'
 
-require 'logger'
+require 'kubernetes-deploy/logger'
 require 'kubernetes-deploy/runner'
 
 module KubernetesDeploy
   class FatalDeploymentError < StandardError; end
-
-  class << self
-    attr_writer :logger
-
-    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
+  include Logger
 end

data/lib/kubernetes-deploy/kubectl.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module KubernetesDeploy
+  module Kubectl
+    def self.run_kubectl(*args, namespace:, context:, log_failure: true)
+      args = args.unshift("kubectl")
+      args.push("--namespace=#{namespace}") if namespace.present?
+      args.push("--context=#{context}")     if context.present?
+
+      KubernetesDeploy.logger.debug Shellwords.join(args)
+      out, err, st = Open3.capture3(*args)
+      KubernetesDeploy.logger.debug(out.shellescape)
+      if !st.success? && log_failure
+        KubernetesDeploy.logger.warn("The following command failed: #{Shellwords.join(args)}")
+        KubernetesDeploy.logger.warn(err)
+      end
+      [out.chomp, err.chomp, st]
+    end
+  end
+end

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'open3'
 require 'shellwords'
+require 'kubernetes-deploy/kubectl'
 
 module KubernetesDeploy
   class KubernetesResource
@@ -10,7 +11,7 @@ module KubernetesDeploy
 
     def self.logger
       @logger ||= begin
-        l = Logger.new($stderr)
+        l = ::Logger.new($stderr)
         l.formatter = proc do |_severity, datetime, _progname, msg|
           "[KUBESTATUS][#{datetime}]\t#{msg}\n"
         end
@@ -30,6 +31,7 @@ module KubernetesDeploy
       when 'deployment' then Deployment.new(name, namespace, context, file)
       when 'pod' then Pod.new(name, namespace, context, file)
       when 'redis' then Redis.new(name, namespace, context, file)
+      when 'bugsnag' then Bugsnag.new(name, namespace, context, file)
       when 'ingress' then Ingress.new(name, namespace, context, file)
       when 'persistentvolumeclaim' then PersistentVolumeClaim.new(name, namespace, context, file)
       when 'service' then Service.new(name, namespace, context, file)
@@ -112,20 +114,15 @@ module KubernetesDeploy
       type.downcase.pluralize
     end
 
-    def run_kubectl(*args)
-      raise FatalDeploymentError, "Namespace missing for namespaced command" if namespace.blank?
-      raise FatalDeploymentError, "Explicit context is required to run this command" if context.blank?
-      args = args.unshift("kubectl").push("--namespace=#{namespace}").push("--context=#{context}")
-
-      KubernetesDeploy.logger.debug Shellwords.join(args)
-      out, err, st = Open3.capture3(*args)
-      KubernetesDeploy.logger.debug(out.shellescape)
-      KubernetesDeploy.logger.debug("[ERROR] #{err.shellescape}") unless st.success?
-      [out.chomp, st]
-    end
-
     def log_status
       KubernetesResource.logger.info("[#{@context}][#{@namespace}] #{JSON.dump(status_data)}")
     end
+
+    def run_kubectl(*args)
+      raise FatalDeploymentError, "Namespace missing for namespaced command" if @namespace.blank?
+      raise KubectlError, "Explicit context is required to run this command" if @context.blank?
+
+      Kubectl.run_kubectl(*args, namespace: @namespace, context: @context, log_failure: false)
+    end
   end
 end

data/lib/kubernetes-deploy/kubernetes_resource/bugsnag.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+module KubernetesDeploy
+  class Bugsnag < KubernetesResource
+    TIMEOUT = 1.minute
+
+    def initialize(name, namespace, context, file)
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
+      @secret_found = false
+    end
+
+    def sync
+      _, _err, st = run_kubectl("get", type, @name)
+      @found = st.success?
+      if @found
+        secrets, _err, _st = run_kubectl("get", "secrets", "--output=name")
+        @secret_found = secrets.split.any? { |s| s.end_with?("-bugsnag") }
+      end
+      @status = @secret_found ? "Available" : "Unknown"
+      log_status
+    end
+
+    def deploy_succeeded?
+      @secret_found
+    end
+
+    def deploy_failed?
+      false
+    end
+
+    def exists?
+      @found
+    end
+
+    def tpr?
+      true
+    end
+  end
+end

data/lib/kubernetes-deploy/kubernetes_resource/cloudsql.rb

@@ -11,7 +11,7 @@ module KubernetesDeploy
     end
 
     def sync
-      _, st = run_kubectl("get", type, @name)
+      _, _err, st = run_kubectl("get", type, @name)
       @found = st.success?
       @status = if cloudsql_proxy_deployment_exists? && mysql_service_exists?
         "Provisioned"
@@ -41,7 +41,7 @@ module KubernetesDeploy
     private
 
     def cloudsql_proxy_deployment_exists?
-      deployment, st = run_kubectl("get", "deployments", "cloudsql-proxy", "-o=json")
+      deployment, _err, st = run_kubectl("get", "deployments", "cloudsql-proxy", "-o=json")
 
       if st.success?
         parsed = JSON.parse(deployment)
@@ -56,7 +56,7 @@ module KubernetesDeploy
     end
 
     def mysql_service_exists?
-      service, st = run_kubectl("get", "services", "mysql", "-o=json")
+      service, _err, st = run_kubectl("get", "services", "mysql", "-o=json")
 
       if st.success?
         parsed = JSON.parse(service)

data/lib/kubernetes-deploy/kubernetes_resource/config_map.rb

@@ -11,7 +11,7 @@ module KubernetesDeploy
     end
 
     def sync
-      _, st = run_kubectl("get", type, @name)
+      _, _err, st = run_kubectl("get", type, @name)
       @status = st.success? ? "Available" : "Unknown"
       @found = st.success?
       log_status

data/lib/kubernetes-deploy/kubernetes_resource/deployment.rb

@@ -11,7 +11,7 @@ module KubernetesDeploy
     end
 
     def sync
-      json_data, st = run_kubectl("get", type, @name, "--output=json")
+      json_data, _err, st = run_kubectl("get", type, @name, "--output=json")
       @found = st.success?
       @rollout_data = {}
       @status = nil
@@ -20,9 +20,9 @@ module KubernetesDeploy
       if @found
         @rollout_data = JSON.parse(json_data)["status"]
           .slice("updatedReplicas", "replicas", "availableReplicas", "unavailableReplicas")
-        @status, _ = run_kubectl("rollout", "status", type, @name, "--watch=false") if @deploy_started
+        @status, _err, _ = run_kubectl("rollout", "status", type, @name, "--watch=false") if @deploy_started
 
-        pod_list, st = run_kubectl("get", "pods", "-a", "-l", "name=#{name}", "--output=json")
+        pod_list, _err, st = run_kubectl("get", "pods", "-a", "-l", "name=#{name}", "--output=json")
         if st.success?
           pods_json = JSON.parse(pod_list)["items"]
           pods_json.each do |pod_json|

data/lib/kubernetes-deploy/kubernetes_resource/ingress.rb

@@ -11,7 +11,7 @@ module KubernetesDeploy
     end
 
     def sync
-      _, st = run_kubectl("get", type, @name)
+      _, _err, st = run_kubectl("get", type, @name)
       @status = st.success? ? "Created" : "Unknown"
       @found = st.success?
       log_status

data/lib/kubernetes-deploy/kubernetes_resource/persistent_volume_claim.rb

@@ -11,7 +11,7 @@ module KubernetesDeploy
     end
 
     def sync
-      @status, st = run_kubectl("get", type, @name, "--output=jsonpath={.status.phase}")
+      @status, _err, st = run_kubectl("get", type, @name, "--output=jsonpath={.status.phase}")
       @found = st.success?
       log_status
     end

data/lib/kubernetes-deploy/kubernetes_resource/pod.rb

@@ -14,7 +14,7 @@ module KubernetesDeploy
     end
 
     def sync
-      out, st = run_kubectl("get", type, @name, "-a", "--output=json")
+      out, _err, st = run_kubectl("get", type, @name, "-a", "--output=json")
       if @found = st.success?
         pod_data = JSON.parse(out)
         interpret_json_data(pod_data)
@@ -77,7 +77,12 @@ module KubernetesDeploy
       return {} unless exists? && @containers.present? && !@already_displayed
 
       @containers.each do |container_name|
-        out, st = run_kubectl("logs", @name, "--timestamps=true", "--since-time=#{@deploy_started.to_datetime.rfc3339}")
+        out, _err, st = run_kubectl(
+          "logs",
+          @name,
+          "--timestamps=true",
+          "--since-time=#{@deploy_started.to_datetime.rfc3339}"
+        )
         next unless st.success? && out.present?
 
         KubernetesDeploy.logger.info "Logs from #{id} container #{container_name}:\x1b[0m \n#{out}\n"

data/lib/kubernetes-deploy/kubernetes_resource/redis.rb

@@ -12,7 +12,7 @@ module KubernetesDeploy
     end
 
     def sync
-      _, st = run_kubectl("get", type, @name)
+      _, _err, st = run_kubectl("get", type, @name)
       @found = st.success?
       @status = if redis_deployment_exists? && redis_service_exists?
         "Provisioned"
@@ -42,7 +42,7 @@ module KubernetesDeploy
     private
 
     def redis_deployment_exists?
-      deployment, st = run_kubectl("get", "deployments", "redis-#{redis_resource_uuid}", "-o=json")
+      deployment, _err, st = run_kubectl("get", "deployments", "redis-#{redis_resource_uuid}", "-o=json")
 
       if st.success?
         parsed = JSON.parse(deployment)
@@ -57,7 +57,7 @@ module KubernetesDeploy
     end
 
     def redis_service_exists?
-      service, st = run_kubectl("get", "services", "redis-#{redis_resource_uuid}", "-o=json")
+      service, _err, st = run_kubectl("get", "services", "redis-#{redis_resource_uuid}", "-o=json")
 
       if st.success?
         parsed = JSON.parse(service)
@@ -73,7 +73,7 @@ module KubernetesDeploy
     def redis_resource_uuid
       return @redis_resource_uuid if defined?(@redis_resource_uuid) && @redis_resource_uuid
 
-      redis, st = run_kubectl("get", "redises", @name, "-o=json")
+      redis, _err, st = run_kubectl("get", "redises", @name, "-o=json")
       if st.success?
         parsed = JSON.parse(redis)
 

data/lib/kubernetes-deploy/kubernetes_resource/service.rb

@@ -11,10 +11,10 @@ module KubernetesDeploy
     end
 
     def sync
-      _, st = run_kubectl("get", type, @name)
+      _, _err, st = run_kubectl("get", type, @name)
       @found = st.success?
       if @found
-        endpoints, st = run_kubectl("get", "endpoints", @name, "--output=jsonpath={.subsets[*].addresses[*].ip}")
+        endpoints, _err, st = run_kubectl("get", "endpoints", @name, "--output=jsonpath={.subsets[*].addresses[*].ip}")
         @num_endpoints = (st.success? ? endpoints.split.length : 0)
       else
         @num_endpoints = 0

data/lib/kubernetes-deploy/logger.rb

@@ -0,0 +1,45 @@
+# 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/runner.rb

@@ -16,11 +16,13 @@ require 'kubernetes-deploy/kubernetes_resource'
   pod
   redis
   service
+  bugsnag
 ).each do |subresource|
   require "kubernetes-deploy/kubernetes_resource/#{subresource}"
 end
 require 'kubernetes-deploy/resource_watcher'
 require "kubernetes-deploy/ui_helpers"
+require 'kubernetes-deploy/kubectl'
 
 module KubernetesDeploy
   class Runner
@@ -29,6 +31,7 @@ module KubernetesDeploy
     PREDEPLOY_SEQUENCE = %w(
       Cloudsql
       Redis
+      Bugsnag
       ConfigMap
       PersistentVolumeClaim
       Pod
@@ -71,7 +74,7 @@ MSG
     end
 
     def initialize(namespace:, current_sha:, context:, template_dir:,
-      wait_for_completion:, allow_protected_ns: false, prune: true)
+      wait_for_completion:, allow_protected_ns: false, prune: true, bindings: {})
       @namespace = namespace
       @context = context
       @current_sha = current_sha
@@ -81,6 +84,7 @@ MSG
       @wait_for_completion = wait_for_completion
       @allow_protected_ns = allow_protected_ns
       @prune = prune
+      @bindings = bindings
     end
 
     def wait_for_completion?
@@ -123,7 +127,7 @@ MSG
       {
         'current_sha' => @current_sha,
         'deployment_id' => @id,
-      }
+      }.merge(@bindings)
     end
 
     private
@@ -341,24 +345,15 @@ MSG
     end
 
     def run_kubectl(*args, namespaced: true, with_context: true)
-      args = args.unshift("kubectl")
       if namespaced
-        raise FatalDeploymentError, "Namespace missing for namespaced command" if @namespace.blank?
-        args.push("--namespace=#{@namespace}")
+        raise KubectlError, "Namespace missing for namespaced command" if @namespace.blank?
       end
 
       if with_context
-        raise FatalDeploymentError, "Explicit context is required to run this command" if @context.blank?
-        args.push("--context=#{@context}")
+        raise KubectlError, "Explicit context is required to run this command" if @context.blank?
       end
-      KubernetesDeploy.logger.debug Shellwords.join(args)
-      out, err, st = Open3.capture3(*args)
-      KubernetesDeploy.logger.debug(out.shellescape)
-      unless st.success?
-        KubernetesDeploy.logger.warn("The following command failed: #{Shellwords.join(args)}")
-        KubernetesDeploy.logger.warn(err)
-      end
-      [out.chomp, err.chomp, st]
+
+      Kubectl.run_kubectl(*args, namespace: @namespace, context: @context)
     end
   end
 end

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,7 +118,9 @@ files:
 - kubernetes-deploy.gemspec
 - lib/kubernetes-deploy.rb
 - lib/kubernetes-deploy/kubeclient_builder.rb
+- lib/kubernetes-deploy/kubectl.rb
 - lib/kubernetes-deploy/kubernetes_resource.rb
+- lib/kubernetes-deploy/kubernetes_resource/bugsnag.rb
 - lib/kubernetes-deploy/kubernetes_resource/cloudsql.rb
 - lib/kubernetes-deploy/kubernetes_resource/config_map.rb
 - lib/kubernetes-deploy/kubernetes_resource/deployment.rb
@@ -127,6 +129,7 @@ files:
 - lib/kubernetes-deploy/kubernetes_resource/pod.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