kubernetes-deploy 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a66de972d0f1d21cd2034ef65b2e5e30f2152e91
-  data.tar.gz: 207ecb8b75891de54c30acba082d55f85a9e3272
+  metadata.gz: 37ace35e766d0e991bf224d97c99cbadfde2c623
+  data.tar.gz: 3f10fd5a9471ca53135b5f817c2e949091171294
 SHA512:
-  metadata.gz: 4294f06b1cc979131b412a7a546aaf36c4793ef2921e641a0760bb93f24caca238781e27ae1d89b8eef47a90977ab2f78ec65cf4310440c023c0249de574cb26
-  data.tar.gz: 5a58d96ef5154fc75f46ca155aefa55b3b056ff1c51ee153e1e588565c10465d5214ce79b14c6da66d46154a103f9f54196a2a3de4a6ce0b788cb924919b0c51
+  metadata.gz: 491a65c67cfbe03eb70996bc3a5d27ac19767f654e896e522f1719930b5df628ec2d498e9a7e30e1b0244df14bac7036bdcc7986c0f256bd1ca2f6f9fc028607
+  data.tar.gz: d952118387e0bee804983b5a7e686a16c603f3b3c98ec69a187aa9d0d79f072117429f558d18ca283c77cabe004d1c40f1f8928a6426f593fcb1fa7a0e199e4e

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+# Ignore RuboCop cache
+.rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml

data/.rubocop.yml

@@ -0,0 +1,5 @@
+inherit_from:
+  - http://shopify.github.io/ruby-style-guide/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.3

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem 'pry'
 gem 'kubeclient'
+gem 'rubocop'

data/README.md

@@ -1,6 +1,6 @@
 # Kubernetes::Deploy
 
-[![Build status](https://badge.buildkite.com/0f2d4956d49fbc795f9c17b0a741a6aa9ea532738e5f872ac8.svg)](https://buildkite.com/shopify/kubernetes-deploy-gem)
+[![Build status](https://badge.buildkite.com/0f2d4956d49fbc795f9c17b0a741a6aa9ea532738e5f872ac8.svg?branch=master)](https://buildkite.com/shopify/kubernetes-deploy-gem)
 
 Deploy script used to manage a Kubernetes application's namespace with [Shipit](https://github.com/Shopify/shipit-engine).
 

data/bin/ci

@@ -1,32 +1,13 @@
 #!/bin/bash
 set -eox pipefail
 
-MINIKUBE_VER=0.16.0
 KUBERNETES_VER=1.5.2
-DOCKER_MACHINE_KVM_VER=0.7.0
 
 echo "--- Installing dependencies"
-curl -Lo minikube https://storage.googleapis.com/minikube/releases/v$MINIKUBE_VER/minikube-linux-amd64
-chmod +x minikube
-sudo mv minikube /usr/local/bin/
-
-# minikube requires kubectl
-curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBERNETES_VER/bin/linux/amd64/kubectl
-chmod +x kubectl
-sudo mv kubectl /usr/local/bin/
-
-# KVM support for minikube
-curl -Lo docker-machine-driver-kvm https://github.com/dhiltgen/docker-machine-kvm/releases/download/v$DOCKER_MACHINE_KVM_VER/docker-machine-driver-kvm
-chmod +x docker-machine-driver-kvm
-sudo mv docker-machine-driver-kvm /usr/local/bin/
-
-minikube config set vm-driver kvm
-
-gem install bundler --no-ri --no-rdoc
 bundle install --jobs 4
 
 echo "--- Starting minikube"
-minikube start --cpus 2 --memory 2048 --disk-size=2gb --kubernetes-version=$KUBERNETES_VER
+minikube start --cpus 2 --memory 2048 --disk-size=2gb --kubernetes-version=$KUBERNETES_VER --logtostderr
 
 echo "--- Running tests"
 bundle exec rake test

data/exe/kubernetes-deploy

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'kubernetes-deploy'
 
@@ -13,11 +14,12 @@ ARGV.options do |opts|
 end
 
 if !template_dir && ENV.key?("ENVIRONMENT")
-  template_dir = "config/deploy/#{ENV["ENVIRONMENT"]}"
+  template_dir = "config/deploy/#{ENV['ENVIRONMENT']}"
 end
 
 if !template_dir || template_dir.empty?
-  puts "Template directory is unknown. Either specify --template-dir argument or set $ENVIRONMENT to use config/deploy/$ENVIRONMENT as a default path."
+  puts "Template directory is unknown. " \
+    "Either specify --template-dir argument or set $ENVIRONMENT to use config/deploy/$ENVIRONMENT as a default path."
   exit 1
 end
 

data/lib/kubernetes-deploy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/numeric/time'
@@ -9,35 +10,35 @@ require 'kubernetes-deploy/runner'
 module KubernetesDeploy
   class FatalDeploymentError < StandardError; end
 
-  def self.logger=(value)
-    @logger = value
-  end
+  class << self
+    attr_writer :logger
 
-  def self.logger
-    @logger ||= begin
-      l = Logger.new($stderr)
-      l.level = level_from_env
-      l.formatter = proc do |severity, _datetime, _progname, msg|
-        case severity
-        when "FATAL", "ERROR" then "\033[0;31m[#{severity}]\t#{msg}\x1b[0m\n" # red
-        when "WARN" then "\033[0;33m[#{severity}]\t#{msg}\x1b[0m\n" # yellow
-        when "INFO" then "\033[0;36m#{msg}\x1b[0m\n" # blue
-        else "[#{severity}]\t#{msg}\n"
+    def logger
+      @logger ||= begin
+        l = Logger.new($stderr)
+        l.level = level_from_env
+        l.formatter = proc do |severity, _datetime, _progname, msg|
+          case severity
+          when "FATAL", "ERROR" then "\033[0;31m[#{severity}]\t#{msg}\x1b[0m\n" # red
+          when "WARN" then "\033[0;33m[#{severity}]\t#{msg}\x1b[0m\n" # yellow
+          when "INFO" then "\033[0;36m#{msg}\x1b[0m\n" # blue
+          else "[#{severity}]\t#{msg}\n"
+          end
         end
+        l
       end
-      l
     end
-  end
 
-  private
+    private
 
-  def self.level_from_env
-    return Logger::DEBUG if ENV["DEBUG"]
+    def level_from_env
+      return Logger::DEBUG if ENV["DEBUG"]
 
-    if ENV["LEVEL"]
-      Logger.const_get(ENV["LEVEL"].upcase)
-    else
-      Logger::INFO
+      if ENV["LEVEL"]
+        Logger.const_get(ENV["LEVEL"].upcase)
+      else
+        Logger::INFO
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module KubernetesDeploy
   class Deployment < KubernetesResource
-    TIMEOUT = 15.minutes
+    TIMEOUT = 5.minutes
 
     def initialize(name, namespace, context, file)
       @name, @namespace, @context, @file = name, namespace, context, file

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

@@ -1,6 +1,6 @@
 module KubernetesDeploy
   class Pod < KubernetesResource
-    TIMEOUT = 15.minutes
+    TIMEOUT = 10.minutes
     SUSPICIOUS_CONTAINER_STATES = %w(ImagePullBackOff RunContainerError).freeze
 
     def initialize(name, namespace, context, file, parent: nil)

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

@@ -1,6 +1,6 @@
 module KubernetesDeploy
   class Service < KubernetesResource
-    TIMEOUT = 15.minutes
+    TIMEOUT = 5.minutes
 
     def initialize(name, namespace, context, file)
       @name, @namespace, @context, @file = name, namespace, context, file

data/lib/kubernetes-deploy/runner.rb

@@ -112,6 +112,24 @@ MSG
 
     private
 
+    # Inspect the file referenced in the kubectl stderr
+    # to make it easier for developer to understand what's going on
+    def inspect_kubectl_out_for_files(stderr)
+      # Output example:
+      # error: unable to decode "/tmp/path/to/file": [pos 96]: json: expect char '"' but got char '{'
+      match = stderr.match(/error: unable to decode "(?<path>\S+)":/)
+      return unless match
+
+      path = match[:path]
+      if path.present? && File.file?(path)
+        suspicious_file = File.read(path)
+        KubernetesDeploy.logger.warn("Inspecting the file mentioned in the error message (#{path})")
+        KubernetesDeploy.logger.warn(suspicious_file)
+      else
+        KubernetesDeploy.logger.warn("Detected a file (#{path.inspect}) referenced in the kubectl stderr but was unable to inspect it")
+      end
+    end
+
     def predeploy_priority_resources(resource_list)
       PREDEPLOY_SEQUENCE.each do |resource_type|
         matching_resources = resource_list.select { |r| r.type == resource_type }
@@ -269,7 +287,14 @@ MSG
         PRUNE_WHITELIST.each { |type| command.push("--prune-whitelist=#{type}") }
       end
 
-      run_kubectl(*command)
+      _, err, st = run_kubectl(*command)
+      unless st.success?
+        inspect_kubectl_out_for_files(err)
+        raise FatalDeploymentError, <<-MSG
+"The following command failed: #{Shellwords.join(command)}"
+#{err}
+MSG
+      end
     end
 
     def confirm_context_exists

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md