kubernetes-deploy 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ace35e766d0e991bf224d97c99cbadfde2c623
-  data.tar.gz: 3f10fd5a9471ca53135b5f817c2e949091171294
+  metadata.gz: 243574658a49fa135a24916b5ab9144d1350e3a5
+  data.tar.gz: 8ac19f9d603838a2791da5bfe1c58222a4d082c5
 SHA512:
-  metadata.gz: 491a65c67cfbe03eb70996bc3a5d27ac19767f654e896e522f1719930b5df628ec2d498e9a7e30e1b0244df14bac7036bdcc7986c0f256bd1ca2f6f9fc028607
-  data.tar.gz: d952118387e0bee804983b5a7e686a16c603f3b3c98ec69a187aa9d0d79f072117429f558d18ca283c77cabe004d1c40f1f8928a6426f593fcb1fa7a0e199e4e
+  metadata.gz: 357d21eb05b6f7ae579db5ab5749ff5dc5eac8e3d6e682735e8dfbdef3ec9e5fa1c6324ac68f9fc0b50a7d125bf5d7297549ac001f70f204b92dc4560d1c5b12
+  data.tar.gz: 88e3506ab13ecbe080b155ecaf0bd825de3987235ab2fb62058b420ba722c299c5a12060d4ada535740cd6b40bcaf0cf969c927829a4e971a0eb30f4262d3143

data/lib/kubernetes-deploy.rb

@@ -17,12 +17,13 @@ module KubernetesDeploy
       @logger ||= begin
         l = Logger.new($stderr)
         l.level = level_from_env
-        l.formatter = proc do |severity, _datetime, _progname, msg|
+        l.formatter = proc do |severity, datetime, _progname, msg|
+          log_text = "[#{severity}][#{datetime}]\t#{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"
+          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

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -11,8 +11,8 @@ module KubernetesDeploy
     def self.logger
       @logger ||= begin
         l = Logger.new($stderr)
-        l.formatter = proc do |_severity, _datetime, _progname, msg|
-          "#{msg}\n"
+        l.formatter = proc do |_severity, datetime, _progname, msg|
+          "[KUBESTATUS][#{datetime}]\t#{msg}\n"
         end
         l
       end
@@ -125,7 +125,7 @@ module KubernetesDeploy
     end
 
     def log_status
-      KubernetesResource.logger.info("[KUBESTATUS][#{@context}][#{@namespace}] #{JSON.dump(status_data)}")
+      KubernetesResource.logger.info("[#{@context}][#{@namespace}] #{JSON.dump(status_data)}")
     end
   end
 end

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

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class Cloudsql < KubernetesResource
     TIMEOUT = 5.minutes
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync
@@ -35,6 +39,7 @@ module KubernetesDeploy
     end
 
     private
+
     def cloudsql_proxy_deployment_exists?
       deployment, st = run_kubectl("get", "deployments", "cloudsql-proxy", "-o=json")
 
@@ -64,6 +69,5 @@ module KubernetesDeploy
 
       false
     end
-
   end
 end

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

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class ConfigMap < KubernetesResource
     TIMEOUT = 30.seconds
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync

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

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class Deployment < KubernetesResource
     TIMEOUT = 5.minutes
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync
@@ -14,7 +18,8 @@ module KubernetesDeploy
       @pods = []
 
       if @found
-        @rollout_data = JSON.parse(json_data)["status"].slice("updatedReplicas", "replicas", "availableReplicas", "unavailableReplicas")
+        @rollout_data = JSON.parse(json_data)["status"]
+          .slice("updatedReplicas", "replicas", "availableReplicas", "unavailableReplicas")
         @status, _ = run_kubectl("rollout", "status", type, @name, "--watch=false") if @deploy_started
 
         pod_list, st = run_kubectl("get", "pods", "-a", "-l", "name=#{name}", "--output=json")

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

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class Ingress < KubernetesResource
     TIMEOUT = 30.seconds
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync

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

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class PersistentVolumeClaim < KubernetesResource
     TIMEOUT = 5.minutes
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync

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

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class Pod < KubernetesResource
     TIMEOUT = 10.minutes
     SUSPICIOUS_CONTAINER_STATES = %w(ImagePullBackOff RunContainerError).freeze
 
     def initialize(name, namespace, context, file, parent: nil)
-      @name, @namespace, @context, @file, @parent = name, namespace, context, file, parent
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
+      @parent = parent
       @bare = !@parent
     end
 
@@ -18,8 +23,8 @@ module KubernetesDeploy
         @ready = false
         @containers = []
       end
-      display_logs if @bare && deploy_finished?
       log_status
+      display_logs if @bare && deploy_finished?
     end
 
     def interpret_json_data(pod_data)
@@ -31,12 +36,12 @@ module KubernetesDeploy
           waiting_state = status["state"]["waiting"] if status["state"]
           reason = waiting_state["reason"] if waiting_state
           next unless SUSPICIOUS_CONTAINER_STATES.include?(reason)
-          KubernetesDeploy.logger.warn("#{id} has container in state #{reason} (#{waiting_state["message"]})")
+          KubernetesDeploy.logger.warn("#{id} has container in state #{reason} (#{waiting_state['message']})")
         end
       end
 
       if @phase == "Failed"
-        @status = "#{@phase} (Reason: #{pod_data["status"]["reason"]})"
+        @status = "#{@phase} (Reason: #{pod_data['status']['reason']})"
       elsif @phase == "Terminating"
         @status = @phase
       else
@@ -75,8 +80,7 @@ module KubernetesDeploy
         out, 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}:"
-        KubernetesResource.logger.info(out)
+        KubernetesDeploy.logger.info "Logs from #{id} container #{container_name}:\x1b[0m \n#{out}\n"
         @already_displayed = true
       end
     end

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

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class Redis < KubernetesResource
     TIMEOUT = 5.minutes
-    UUID_ANNOTATION = "redis.stable.shopify.io/owner_uid".freeze
+    UUID_ANNOTATION = "redis.stable.shopify.io/owner_uid"
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync
@@ -36,6 +40,7 @@ module KubernetesDeploy
     end
 
     private
+
     def redis_deployment_exists?
       deployment, st = run_kubectl("get", "deployments", "redis-#{redis_resource_uuid}", "-o=json")
 
@@ -75,6 +80,5 @@ module KubernetesDeploy
         @redis_resource_uuid = parsed.fetch("metadata", {}).fetch("uid", nil)
       end
     end
-
   end
 end

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

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   class Service < KubernetesResource
     TIMEOUT = 5.minutes
 
     def initialize(name, namespace, context, file)
-      @name, @namespace, @context, @file = name, namespace, context, file
+      @name = name
+      @namespace = namespace
+      @context = context
+      @file = file
     end
 
     def sync

data/lib/kubernetes-deploy/runner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'open3'
 require 'securerandom'
 require 'erb'
@@ -126,7 +127,8 @@ MSG
         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")
+        KubernetesDeploy.logger.warn("Detected a file (#{path.inspect}) referenced in the kubectl stderr " \
+          "but was unable to inspect it")
       end
     end
 
@@ -136,9 +138,9 @@ MSG
         next if matching_resources.empty?
         deploy_resources(matching_resources)
         wait_for_completion(matching_resources)
-        fail_count = matching_resources.count { |r| r.deploy_failed? || r.deploy_timed_out? }
-        if fail_count > 0
-          raise FatalDeploymentError, "#{fail_count} priority resources failed to deploy"
+        fail_list = matching_resources.select { |r| r.deploy_failed? || r.deploy_timed_out? }.map(&:id)
+        unless fail_list.empty?
+          raise FatalDeploymentError, "The following priority resources failed to deploy: #{fail_list.join(', ')}"
         end
       end
     end
@@ -159,7 +161,7 @@ MSG
     end
 
     def discover_resource_via_dry_run(tempfile)
-      resource_id, err, st = run_kubectl("create", "-f", tempfile.path, "--dry-run", "--output=name")
+      resource_id, _err, st = run_kubectl("create", "-f", tempfile.path, "--dry-run", "--output=name")
       raise FatalDeploymentError, "Dry run failed for template #{File.basename(tempfile.path)}." unless st.success?
       resource_id
     end
@@ -168,6 +170,8 @@ MSG
       file_content = File.read(File.join(@template_dir, filename))
       rendered_content = render_template(filename, file_content)
       YAML.load_stream(rendered_content) do |doc|
+        next if doc.blank?
+
         f = Tempfile.new(filename)
         f.write(YAML.dump(doc))
         f.close
@@ -183,8 +187,7 @@ MSG
         log_green("Deploy succeeded!")
       else
         fail_list = resources.select { |r| r.deploy_failed? || r.deploy_timed_out? }.map(&:id)
-        KubernetesDeploy.logger.error("The following resources failed to deploy: #{fail_list.join(", ")}")
-        raise FatalDeploymentError, "#{fail_list.length} resources failed to deploy"
+        raise FatalDeploymentError, "The following resources failed to deploy: #{fail_list.join(', ')}"
       end
     end
 
@@ -196,7 +199,7 @@ MSG
       KubernetesDeploy.logger.info("Waiting for #{human_resources} with #{max_wait_time}s timeout")
       while watched_resources.present?
         if Time.now.utc < delay_sync_until
-          sleep (delay_sync_until - Time.now.utc)
+          sleep(delay_sync_until - Time.now.utc)
         end
         delay_sync_until = Time.now.utc + 3 # don't pummel the API if the sync is fast
         watched_resources.each(&:sync)
@@ -204,8 +207,6 @@ MSG
         newly_finished_resources.each do |resource|
           next unless resource.deploy_failed? || resource.deploy_timed_out?
           KubernetesDeploy.logger.error("#{resource.id} failed to deploy with status '#{resource.status}'.")
-          KubernetesDeploy.logger.error("This script will continue to poll until the status of all resources deployed in this phase is resolved, but the deploy is now doomed and you may wish abort it.")
-          KubernetesDeploy.logger.error(resource.status_data)
         end
       end
 
@@ -227,7 +228,7 @@ MSG
     def validate_configuration
       errors = []
       if ENV["KUBECONFIG"].blank? || !File.file?(ENV["KUBECONFIG"])
-        errors << "Kube config not found at #{ENV["KUBECONFIG"]}"
+        errors << "Kube config not found at #{ENV['KUBECONFIG']}"
       end
 
       if @current_sha.blank?
@@ -250,7 +251,7 @@ MSG
         errors << "Context must be specified"
       end
 
-      raise FatalDeploymentError, "Configuration invalid: #{errors.join(", ")}" unless errors.empty?
+      raise FatalDeploymentError, "Configuration invalid: #{errors.join(', ')}" unless errors.empty?
       KubernetesDeploy.logger.info("All required parameters and files are present")
     end
 
@@ -338,7 +339,7 @@ MSG
     def phase_heading(phase_name)
       @current_phase += 1
       heading = "Phase #{@current_phase}: #{phase_name}"
-      padding = (100.0 - heading.length)/2
+      padding = (100.0 - heading.length) / 2
       KubernetesDeploy.logger.info("")
       KubernetesDeploy.logger.info("#{'-' * padding.floor}#{heading}#{'-' * padding.ceil}")
     end

data/lib/kubernetes-deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kubernetes deploy scripts