partial pr review

Shopify · Jan 18, 2019 · 796021d · 796021d
1 parent 55f62ab
commit 796021d
Show file tree

Hide file tree

Showing 5 changed files with 463 additions and 448 deletions.
diff --git a/lib/kubernetes-deploy/kubernetes_resource/custom_resource.rb b/lib/kubernetes-deploy/kubernetes_resource/custom_resource.rb
@@ -4,7 +4,7 @@ module KubernetesDeploy
   class CustomResource < KubernetesResource
     TIMEOUT_MESSAGE_DIFFERENT_GENERATIONS = <<~MSG
       This resource's status could not be used to determine rollout success because it was still out of date
-      (.metadata.generation != .status.observedGeneration) after #{timeout}s.
+      (.metadata.generation != .status.observedGeneration).
     MSG
 
     def initialize(namespace:, context:, definition:, logger:, statsd_tags: [], crd:)
@@ -45,16 +45,27 @@ def timeout_message
       end
     end
 
+    def status
+      if !exists? || rollout_conditions.nil?
+        super
+      elsif deploy_succeeded?
+        "Healthy"
+      elsif deploy_failed?
+        "Unhealthy"
+      end
+    end
+
     def type
       kind
     end
 
     def validate_definition(kubectl)
       super
+
       @crd.validate_rollout_conditions
     rescue RolloutConditionsError => e
       @validation_errors << "Annotation #{CustomResourceDefinition::ROLLOUT_CONDITIONS_ANNOTATION} " \
-      "on #{kind} is invalid: #{e}"
+      "on #{@crd.name} is invalid: #{e}"
     end
 
     private

diff --git a/lib/kubernetes-deploy/kubernetes_resource/custom_resource_definition.rb b/lib/kubernetes-deploy/kubernetes_resource/custom_resource_definition.rb
@@ -47,6 +47,10 @@ def kind
       @definition.dig("spec", "names", "kind")
     end
 
+    def name
+      @definition.dig("metadata", "name")
+    end
+
     def prunable?
       prunable = @definition.dig("metadata", "annotations", "kubernetes-deploy.shopify.io/prunable")
       prunable == "true"
@@ -67,7 +71,7 @@ def validate_definition(_)
 
       validate_rollout_conditions
     rescue RolloutConditionsError => e
-      @validation_errors << "Annotation #{ROLLOUT_CONDITIONS_ANNOTATION} on #{kind} is invalid: #{e}"
+      @validation_errors << "Annotation #{ROLLOUT_CONDITIONS_ANNOTATION} on #{name} is invalid: #{e}"
     end
 
     def validate_rollout_conditions

diff --git a/lib/kubernetes-deploy/rollout_conditions.rb b/lib/kubernetes-deploy/rollout_conditions.rb
@@ -88,8 +88,7 @@ def validate!
     def validate_conditions(conditions, source_key, required: true)
       return [] unless conditions.present? || required
       errors = []
-      errors << "Missing required key '#{source_key}'" if conditions.nil?
-      errors << "#{source_key} should be Array but found #{conditions[source_key].class}" unless conditions.is_a?(Array)
+      errors << "#{source_key} should be Array but found #{conditions.class}" unless conditions.is_a?(Array)
       errors << "#{source_key} must contain at least one entry" if conditions.empty?
       return errors if errors.present?