kubernetes-deploy 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 272fadd954c2e206c412aca3e26d5efde55fd9e1
-  data.tar.gz: 999e798b55468bdd5b5ffc91438b95c0560d6d6d
+  metadata.gz: 3ce203eba2242a33d7bdf6d5e6ed33dce0de85c2
+  data.tar.gz: 5d8ead3d6d9ca37ee9edc6701e98a2acdedffd31
 SHA512:
-  metadata.gz: a30a0c161a519c6c58779ea8d155bf0970d2afae90a8e2c68c8853ef8fa019ff46ea914c24262981329f1a28ab7bf4eac89d0e03f33fd96f771ba8fc6b87fbdb
-  data.tar.gz: e8ddd22ae6d095a5169a7ce0a131b40e2595d70cd9bf913486a2dd85b6c5dbe823917bb1ae2006cdf4d7b2c2f06c8b71d816ecb09e3d707d705ce33186935c55
+  metadata.gz: c81aaf0f6442b0dac0f2ce67c175eefe120574347eb470979f5f2d75c678e422cc92dd5959160a61e8069f9758a4919830ff5db4c5137911dd72df83b456181a
+  data.tar.gz: dd78a292e16ae848bda6ed798c39eac63aa71395a1c5e447297d8f33262e3db47377a15537559b56fa3c2a3f5541607bb85c3987cf92366069b9b9a0974461f8

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -115,14 +115,9 @@ module KubernetesDeploy
       !deploy_succeeded? && !deploy_failed? && (Time.now.utc - @deploy_started > timeout)
     end
 
-    def tpr?
-      false
-    end
-
     # Expected values: :apply, :replace, :replace_force
     def deploy_method
-      # TPRs must use update for now: https://github.com/kubernetes/kubernetes/issues/39906
-      tpr? ? :replace : :apply
+      :apply
     end
 
     def debug_message

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

@@ -25,9 +25,5 @@ module KubernetesDeploy
     def exists?
       @found
     end
-
-    def tpr?
-      true
-    end
   end
 end

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

@@ -23,10 +23,6 @@ module KubernetesDeploy
       false
     end
 
-    def tpr?
-      true
-    end
-
     def exists?
       @found
     end

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

@@ -55,15 +55,10 @@ module KubernetesDeploy
     end
 
     def timeout_message
-      return if unmanaged?
-      return unless @phase == "Running" && !@ready
-      pieces = ["Your pods are running, but the following containers seem to be failing their readiness probes:"]
-      @containers.each do |c|
-        next if c.init_container? || c.ready?
-        yellow_name = ColorizedString.new(c.name).yellow
-        pieces << "> #{yellow_name} must respond with a good status code at '#{c.probe_location}'"
-      end
-      pieces.join("\n") + "\n"
+      return STANDARD_TIMEOUT_MESSAGE unless readiness_probe_failure?
+      probe_failure_msgs = @containers.map(&:readiness_fail_reason).compact
+      header = "The following containers have not passed their readiness probes on at least one pod:\n"
+      header + probe_failure_msgs.join("\n") + "\n"
     end
 
     def failure_message
@@ -104,6 +99,12 @@ module KubernetesDeploy
 
     private
 
+    def readiness_probe_failure?
+      return false if @ready || unmanaged?
+      return false if @phase != "Running"
+      @containers.any?(&:readiness_fail_reason)
+    end
+
     def ready?(status_data)
       ready_condition = status_data.fetch("conditions", []).find { |condition| condition["type"] == "Ready" }
       ready_condition.present? && (ready_condition["status"] == "True")
@@ -162,13 +163,14 @@ module KubernetesDeploy
     end
 
     class Container
-      attr_reader :name, :probe_location
+      attr_reader :name
 
       def initialize(definition, init_container: false)
         @init_container = init_container
         @name = definition["name"]
         @image = definition["image"]
-        @probe_location = definition.dig("readinessProbe", "httpGet", "path")
+        @http_probe_location = definition.dig("readinessProbe", "httpGet", "path")
+        @exec_probe_command = definition.dig("readinessProbe", "exec", "command")
         @status = {}
       end
 
@@ -198,8 +200,20 @@ module KubernetesDeploy
         end
       end
 
+      def readiness_fail_reason
+        return if ready? || init_container?
+        return unless (@http_probe_location || @exec_probe_command).present?
+
+        yellow_name = ColorizedString.new(name).yellow
+        if @http_probe_location
+          "> #{yellow_name} must respond with a good status code at '#{@http_probe_location}'"
+        elsif @exec_probe_command
+          "> #{yellow_name} must exit 0 from the following command: '#{@exec_probe_command.join(' ')}'"
+        end
+      end
+
       def ready?
-        @status['ready'] == "true"
+        @status['ready'] == true
       end
 
       def init_container?

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

@@ -25,10 +25,6 @@ module KubernetesDeploy
       false
     end
 
-    def tpr?
-      true
-    end
-
     def exists?
       @found
     end

data/lib/kubernetes-deploy/runner.rb

@@ -47,7 +47,7 @@ module KubernetesDeploy
       kube-public
     )
 
-    # Things removed from default prune whitelist:
+    # Things removed from default prune whitelist at https://github.com/kubernetes/kubernetes/blob/0dff56b4d88ec7551084bf89028dbeebf569620e/pkg/kubectl/cmd/apply.go#L411:
     # core/v1/Namespace -- not namespaced
     # core/v1/PersistentVolume -- not namespaced
     # core/v1/Endpoints -- managed by services
@@ -55,20 +55,19 @@ module KubernetesDeploy
     # core/v1/ReplicationController -- superseded by deployments/replicasets
     # extensions/v1beta1/ReplicaSet -- managed by deployments
     # core/v1/Secret -- should not committed / managed by shipit
-    BASE_PRUNE_WHITELIST = %w(
+    PRUNE_WHITELIST = %w(
       core/v1/ConfigMap
       core/v1/Pod
       core/v1/Service
       batch/v1/Job
       extensions/v1beta1/DaemonSet
       extensions/v1beta1/Deployment
+      apps/v1beta1/Deployment
       extensions/v1beta1/Ingress
       apps/v1beta1/StatefulSet
+      autoscaling/v1/HorizontalPodAutoscaler
     ).freeze
 
-    PRUNE_WHITELIST_V_1_5 = %w(extensions/v1beta1/HorizontalPodAutoscaler).freeze
-    PRUNE_WHITELIST_V_1_6 = %w(autoscaling/v1/HorizontalPodAutoscaler).freeze
-
     def initialize(namespace:, context:, current_sha:, template_dir:, logger:, bindings: {})
       @namespace = namespace
       @context = context
@@ -170,23 +169,6 @@ module KubernetesDeploy
       end
     end
 
-    def versioned_prune_whitelist
-      if server_major_version == "1.5"
-        BASE_PRUNE_WHITELIST + PRUNE_WHITELIST_V_1_5
-      else
-        BASE_PRUNE_WHITELIST + PRUNE_WHITELIST_V_1_6
-      end
-    end
-
-    def server_major_version
-      @server_major_version ||= begin
-        out, _, _ = kubectl.run('version', '--short')
-        matchdata = /Server Version: v(?<version>\d\.\d)/.match(out)
-        raise "Could not determine server version" unless matchdata[:version]
-        matchdata[:version]
-      end
-    end
-
     # Inspect the file referenced in the kubectl stderr
     # to make it easier for developer to understand what's going on
     def find_bad_files_from_kubectl_output(stderr)
@@ -398,7 +380,7 @@ module KubernetesDeploy
 
       if prune
         command.push("--prune", "--all")
-        versioned_prune_whitelist.each { |type| command.push("--prune-whitelist=#{type}") }
+        PRUNE_WHITELIST.each { |type| command.push("--prune-whitelist=#{type}") }
       end
 
       out, err, st = kubectl.run(*command, log_failure: false)

data/lib/kubernetes-deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Katrina Verey