kubernetes-deploy 0.12.8 → 0.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88420aeda8ed5a7da13313a73bc90a6a0ca1a88
-  data.tar.gz: a86e95c5689b0f269662fe82a53871a93100847c
+  metadata.gz: 6d865102d9b707cc6ef67eba2609c3eaaa94903a
+  data.tar.gz: 6e6f5ec188571c42c5dfd2672f62ccf922eabfb8
 SHA512:
-  metadata.gz: 0b6f16ce8c330da35e925a66382fb4d1814136058f53226f51afa740ff76981c9cb2b02165bcbba384d4fac2905893d447279ee7328ea8579e681096e8eb412a
-  data.tar.gz: 335f3cf2588530d725606fbb3f3927d29d91cf14abe74c6c5aa299a61aaaa4b072cc89f7c273471d52df4622392b5a9d9f0d15e1bca67d855e64dc2c7948ae70
+  metadata.gz: e250b6c3f66bd986fa7f2a11cd5779aa96ff05ce4ddb386d21521aa3e14748135894cb6be004e71205fcc28017c5690d452ba72c6b9d4a0cea7c601104a07bb4
+  data.tar.gz: e0797decff33ef2c7c4d311d85a5b4a78dd5fcb53ae10c9a76ead741b6a89e1b12fb4db1304fb1ad781255cb63ac92d9c9356d563da2b3daad9f18ec89d726ea

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+### 0.12.9
+
+*Bug Fixes*
+- Retry discovering namespace and kubernetes context
+- Expose real error during namespace discovery
+
+### 0.12.8
+*Bug Fixes*
+- Force deployment to use its own hard timeout instead of relying on the replica set

data/README.md

@@ -287,10 +287,11 @@ To make StatsD log what it would have emitted, run a test with `STATSD_DEV=1`.
 
 ## Releasing a new version (Shopify employees)
 
-1. Update the version number in `version.rb` and commit that change with message "Version x.y.z". Don't push yet or you'll confuse Shipit.
-2. Tag the version with `git tag vx.y.z -a -m "Version x.y.z"`
-3. Push both your bump commit and its tag simultaneously with `git push origin master --follow-tags` (note that you can set `git config --global push.followTags true` to turn this flag on by default)
-4. Use the [Shipit Stack](https://shipit.shopify.io/shopify/kubernetes-deploy/rubygems) to build the `.gem` file and upload to [rubygems.org](https://rubygems.org/gems/kubernetes-deploy).
+1. Make sure all merged PRs are reflected in the changelog before creating the commit for the new version.
+2. Update the version number in `version.rb` and commit that change with message "Version x.y.z". Don't push yet or you'll confuse Shipit.
+3. Tag the version with `git tag vx.y.z -a -m "Version x.y.z"`
+4. Push both your bump commit and its tag simultaneously with `git push origin master --follow-tags` (note that you can set `git config --global push.followTags true` to turn this flag on by default)
+5. Use the [Shipit Stack](https://shipit.shopify.io/shopify/kubernetes-deploy/rubygems) to build the `.gem` file and upload to [rubygems.org](https://rubygems.org/gems/kubernetes-deploy).
 
 If you push your commit and the tag separately, Shipit usually fails with `You need to create the v0.7.9 tag first.`. To make it find your tag, go to `Settings` > `Resynchronize this stack` > `Clear git cache`.
 

data/lib/kubernetes-deploy/kubectl.rb

@@ -2,11 +2,12 @@
 
 module KubernetesDeploy
   class Kubectl
-    def initialize(namespace:, context:, logger:, log_failure_by_default:)
+    def initialize(namespace:, context:, logger:, log_failure_by_default:, default_timeout: '30s')
       @namespace = namespace
       @context = context
       @logger = logger
       @log_failure_by_default = log_failure_by_default
+      @default_timeout = default_timeout
 
       raise ArgumentError, "namespace is required" if namespace.blank?
       raise ArgumentError, "context is required" if context.blank?
@@ -18,6 +19,7 @@ module KubernetesDeploy
       args = args.unshift("kubectl")
       args.push("--namespace=#{@namespace}") if use_namespace
       args.push("--context=#{@context}")     if use_context
+      args.push("--request-timeout=#{@default_timeout}") if @default_timeout
 
       @logger.debug Shellwords.join(args)
       out, err, st = Open3.capture3(*args)

data/lib/kubernetes-deploy/runner.rb

@@ -72,12 +72,15 @@ module KubernetesDeploy
       autoscaling/v1/HorizontalPodAutoscaler
     ).freeze
 
-    def initialize(namespace:, context:, current_sha:, template_dir:, logger:, bindings: {})
+    NOT_FOUND_ERROR = 'NotFound'
+
+    def initialize(namespace:, context:, current_sha:, template_dir:, logger:, kubectl_instance: nil, bindings: {})
       @namespace = namespace
       @context = context
       @current_sha = current_sha
       @template_dir = File.expand_path(template_dir)
       @logger = logger
+      @kubectl = kubectl_instance
       @bindings = bindings
       # Max length of podname is only 63chars so try to save some room by truncating sha to 8 chars
       @id = current_sha[0...8] + "-#{SecureRandom.hex(4)}" if current_sha
@@ -401,12 +404,27 @@ module KubernetesDeploy
       elsif !available_contexts.include?(@context)
         raise FatalDeploymentError, "Context #{@context} is not available. Valid contexts: #{available_contexts}"
       end
+      confirm_cluster_reachable
       @logger.info("Context #{@context} found")
     end
 
+    def confirm_cluster_reachable
+      success = false
+      with_retries(2) do
+        _, _, st = kubectl.run("version", use_namespace: false, log_failure: true)
+        success = st.success?
+      end
+
+      raise FatalDeploymentError, "Failed to reach server for #{@context}" unless success
+    end
+
     def confirm_namespace_exists
-      _, _, st = kubectl.run("get", "namespace", @namespace, use_namespace: false, log_failure: false)
-      raise FatalDeploymentError, "Namespace #{@namespace} not found" unless st.success?
+      st, err = nil
+      with_retries(2) do
+        _, err, st = kubectl.run("get", "namespace", @namespace, use_namespace: false, log_failure: true)
+        st.success? || err.include?(NOT_FOUND_ERROR)
+      end
+      raise FatalDeploymentError, "Failed to find namespace. #{err}" unless st.success?
       @logger.info("Namespace #{@namespace} found")
     end
 
@@ -417,5 +435,14 @@ module KubernetesDeploy
     def statsd_tags
       %W(namespace:#{@namespace} sha:#{@current_sha} context:#{@context})
     end
+
+    def with_retries(limit)
+      retried = 0
+      while retried <= limit
+        success = yield
+        break if success
+        retried += 1
+      end
+    end
   end
 end

data/lib/kubernetes-deploy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module KubernetesDeploy
-  VERSION = "0.12.8"
+  VERSION = "0.12.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.12.8
+  version: 0.12.9
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,7 @@ files:
 - ".buildkite/pipeline.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - NO-BINAUTH