kubernetes-deploy 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 861c1898e40c08f1120bc55896920e0359f3f674
-  data.tar.gz: 6c34e454e654acfba418245f3b2a2896272885cb
+  metadata.gz: 13bfb87f3f0cd5b833cb6146f91d7ccdfcf50725
+  data.tar.gz: 3c6cb3d5acf0c405a14759c01444e11244124509
 SHA512:
-  metadata.gz: 4fc044006b4330a42b2d7b60e4b45c67b5be86ffd1c2e4017be9042f21d38a9d695058413ce78a9112406b0c8abf8e3c15bcf04f331f7ccf196cdcff6e62b387
-  data.tar.gz: 61e7d6cd0d6c706fb1db1a601708f781005db36b3e932e8c22a18463580c4b8c551bfdac2db2df0b0ebef1b75258e2e1ae81044595cf7345c4fced52c4f97b6c
+  metadata.gz: 3d101d13086cf414cfc08989c9db9f7858dea14ab523c0424bf871a82ca98babc851ff7aea0be04db984e5aba689e5a2ecc5cc80750d2df4525573e5475f74a7
+  data.tar.gz: f7b35147c24d8dad169c850de62fe0b8108ec538c5626741404e70bdce86860ce04c4ac332b8fc9561598eabbaa81794af64f16c9978c5ee08b4a6e1fd078d7e

data/.rubocop.yml

@@ -2,7 +2,4 @@ inherit_from:
   - http://shopify.github.io/ruby-style-guide/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.1
-
-Layout/IndentHeredoc:
-  EnforcedStyle: active_support
+  TargetRubyVersion: 2.3

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kubernetes-deploy.gemspec

data/README.md

@@ -67,6 +67,7 @@ This repo also includes related tools for [running tasks](#kubernetes-run) and [
 
 ## Prerequisites
 
+* Ruby 2.3+
 * Your cluster must be running Kubernetes v1.6.0 or higher
 * Each app must have a deploy directory containing its Kubernetes templates (see [Templates](#templates))
 * You must remove the` kubectl.kubernetes.io/last-applied-configuration` annotation from any resources in the namespace that are not included in your deploy directory. This annotation is added automatically when you create resources with `kubectl apply`. `kubernetes-deploy` will prune any resources that have this annotation and are not in the deploy directory.**

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/kubernetes-deploy.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kubernetes-deploy/version'
@@ -20,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = '>= 2.3.0'
   spec.add_dependency "activesupport", ">= 4.2"
   spec.add_dependency "kubeclient", "~> 2.3"
   spec.add_dependency "googleauth", ">= 0.5"

data/lib/kubernetes-deploy/deferred_summary_logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module KubernetesDeploy
   # Adds the methods kubernetes-deploy requires to your logger class.
   # These methods include helpers for logging consistent headings, as well as facilities for

data/lib/kubernetes-deploy/ejson_secret_provisioner.rb

@@ -116,7 +116,7 @@ module KubernetesDeploy
       @logger.debug(out)
       raise EjsonSecretError, err unless st.success?
     ensure
-      file.unlink if file
+      file&.unlink
     end
 
     def generate_secret_yaml(secret_name, secret_type, data)

data/lib/kubernetes-deploy/kubeclient_builder/google_friendly_config.rb

@@ -5,7 +5,7 @@ module KubernetesDeploy
   module KubeclientBuilder
     class GoogleFriendlyConfig < Kubeclient::Config
       def fetch_user_auth_options(user)
-        if user['auth-provider'] && (user['auth-provider']['name'] == 'gcp')
+        if user.dig('auth-provider', 'name') == 'gcp'
           { bearer_token: new_token }
         else
           super

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -13,11 +13,11 @@ module KubernetesDeploy
     LOG_LINE_COUNT = 250
 
     DEBUG_RESOURCE_NOT_FOUND_MESSAGE = "None found. Please check your usual logging service (e.g. Splunk)."
-    UNUSUAL_FAILURE_MESSAGE = <<-MSG.strip_heredoc
+    UNUSUAL_FAILURE_MESSAGE = <<~MSG
       It is very unusual for this resource type to fail to deploy. Please try the deploy again.
       If that new deploy also fails, contact your cluster administrator.
       MSG
-    STANDARD_TIMEOUT_MESSAGE = <<-MSG.strip_heredoc
+    STANDARD_TIMEOUT_MESSAGE = <<~MSG
       Kubernetes will continue to attempt to deploy this resource in the cluster, but at this point it is considered unlikely that it will succeed.
       If you have reason to believe it will succeed, retry the deploy to continue to monitor the rollout.
       MSG
@@ -44,7 +44,7 @@ module KubernetesDeploy
 
     def initialize(namespace:, context:, definition:, logger:)
       # subclasses must also set these if they define their own initializer
-      @name = definition.fetch("metadata", {})["name"]
+      @name = definition.dig("metadata", "name")
       unless @name.present?
         logger.summary.add_paragraph("Rendered template content:\n#{definition.to_yaml}")
         raise FatalDeploymentError, "Template is missing required field metadata.name"
@@ -268,7 +268,7 @@ module KubernetesDeploy
       file.write(YAML.dump(@definition))
       file
     ensure
-      file.close if file
+      file&.close
     end
 
     def statsd_tags

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

@@ -54,7 +54,7 @@ module KubernetesDeploy
       if st.success?
         parsed = JSON.parse(service)
 
-        if parsed.fetch("spec", {}).fetch("clusterIP", "") != ""
+        if parsed.dig("spec", "clusterIP").present?
           # the service has an assigned cluster IP and is therefore functioning
           return true
         end
@@ -70,7 +70,7 @@ module KubernetesDeploy
       if st.success?
         parsed = JSON.parse(redis)
 
-        @cloudsql_resource_uuid = parsed.fetch("metadata", {}).fetch("uid", nil)
+        @cloudsql_resource_uuid = parsed.dig("metadata", "uid")
       end
     end
   end

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

@@ -47,15 +47,15 @@ module KubernetesDeploy
     end
 
     def failure_message
-      @latest_rs.failure_message
+      @latest_rs&.failure_message
     end
 
     def timeout_message
       progress_seconds = @definition['spec']['progressDeadlineSeconds']
       if progress_seconds
-        "Deploy timed out due to progressDeadlineSeconds of #{progress_seconds} seconds. #{@latest_rs.timeout_message}"
+        "Deploy timed out due to progressDeadlineSeconds of #{progress_seconds} seconds. #{@latest_rs&.timeout_message}"
       else
-        @latest_rs.timeout_message
+        @latest_rs&.timeout_message
       end
     end
 

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

@@ -162,25 +162,14 @@ module KubernetesDeploy
     end
 
     class Container
-      STATUS_SCAFFOLD = {
-        "state" => {
-          "running" => {},
-          "waiting" => {},
-          "terminated" => {},
-        },
-        "lastState" => {
-          "terminated" => {}
-        }
-      }.freeze
-
       attr_reader :name, :probe_location
 
       def initialize(definition, init_container: false)
         @init_container = init_container
         @name = definition["name"]
         @image = definition["image"]
-        @probe_location = definition.fetch("readinessProbe", {}).fetch("httpGet", {})["path"]
-        @status = STATUS_SCAFFOLD.dup
+        @probe_location = definition.dig("readinessProbe", "httpGet", "path")
+        @status = {}
       end
 
       def doomed?
@@ -188,14 +177,14 @@ module KubernetesDeploy
       end
 
       def doom_reason
-        exit_code = @status['lastState']['terminated']['exitCode']
-        last_terminated_reason = @status["lastState"]["terminated"]["reason"]
-        limbo_reason = @status["state"]["waiting"]["reason"]
-        limbo_message = @status["state"]["waiting"]["message"]
+        exit_code = @status.dig('lastState', 'terminated', 'exitCode')
+        last_terminated_reason = @status.dig("lastState", "terminated", "reason")
+        limbo_reason = @status.dig("state", "waiting", "reason")
+        limbo_message = @status.dig("state", "waiting", "message")
 
         if last_terminated_reason == "ContainerCannotRun"
           # ref: https://github.com/kubernetes/kubernetes/blob/562e721ece8a16e05c7e7d6bdd6334c910733ab2/pkg/kubelet/dockershim/docker_container.go#L353
-          "Failed to start (exit #{exit_code}): #{@status['lastState']['terminated']['message']}"
+          "Failed to start (exit #{exit_code}): #{@status.dig('lastState', 'terminated', 'message')}"
         elsif limbo_reason == "CrashLoopBackOff"
           "Crashing repeatedly (exit #{exit_code}). See logs for more information."
         elsif %w(ImagePullBackOff ErrImagePull).include?(limbo_reason) &&
@@ -218,11 +207,11 @@ module KubernetesDeploy
       end
 
       def update_status(data)
-        @status = STATUS_SCAFFOLD.deep_merge(data || {})
+        @status = data || {}
       end
 
       def reset_status
-        @status = STATUS_SCAFFOLD.dup
+        @status = {}
       end
     end
   end

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

@@ -56,7 +56,7 @@ module KubernetesDeploy
       if st.success?
         parsed = JSON.parse(service)
 
-        if parsed.fetch("spec", {}).fetch("clusterIP", "") != ""
+        if parsed.dig("spec", "clusterIP").present?
           return true
         end
       end
@@ -71,7 +71,7 @@ module KubernetesDeploy
       if st.success?
         parsed = JSON.parse(redis)
 
-        @redis_resource_uuid = parsed.fetch("metadata", {}).fetch("uid", nil)
+        @redis_resource_uuid = parsed.dig("metadata", "uid")
       end
     end
   end

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

@@ -86,7 +86,7 @@ module KubernetesDeploy
 
     def container_names
       regular_containers = @definition["spec"]["template"]["spec"]["containers"].map { |c| c["name"] }
-      init_containers = @definition["spec"]["template"]["spec"].fetch("initContainers", {}).map { |c| c["name"] }
+      init_containers = @definition["spec"]["template"]["spec"].fetch("initContainers", []).map { |c| c["name"] }
       regular_containers + init_containers
     end
 

data/lib/kubernetes-deploy/resource_watcher.rb

@@ -3,7 +3,7 @@ module KubernetesDeploy
   class ResourceWatcher
     def initialize(resources, logger:, deploy_started_at: Time.now.utc)
       unless resources.is_a?(Enumerable)
-        raise ArgumentError, <<-MSG.strip_heredoc
+        raise ArgumentError, <<~MSG
           ResourceWatcher expects Enumerable collection, got `#{resources.class}` instead
         MSG
       end

data/lib/kubernetes-deploy/runner.rb

@@ -125,7 +125,7 @@ module KubernetesDeploy
       else
         deploy_resources(resources, prune: prune, verify: false)
         @logger.summary.add_action("deployed #{resources.length} #{'resource'.pluralize(resources.length)}")
-        warning = <<-MSG.strip_heredoc
+        warning = <<~MSG
           Deploy result verification is disabled for this deploy.
           This means the desired changes were communicated to Kubernetes, but the deploy did not make sure they actually succeeded.
         MSG
@@ -245,7 +245,7 @@ module KubernetesDeploy
         yield doc unless doc.blank?
       end
     rescue Psych::SyntaxError => e
-      debug_msg = <<-INFO.strip_heredoc
+      debug_msg = <<~INFO
         Error message: #{e}
 
         Template content:
@@ -372,7 +372,7 @@ module KubernetesDeploy
         _, err, create_st = kubectl.run("create", "-f", r.file_path, log_failure: false)
 
         next if create_st.success?
-        raise FatalDeploymentError, <<-MSG.strip_heredoc
+        raise FatalDeploymentError, <<~MSG
           Failed to replace or create resource: #{r.id}
           #{err}
         MSG

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module KubernetesDeploy
-  VERSION = "0.9.4"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="