Version 3.9.0

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## next
 
+## 3.9.0
+
+- Remove Elasticsearch specific logic that was introduced in 3.8.0
+- Remove check for observedGeneration.present? introduced in 3.8.1 because it was redundant
+
 ## 3.8.1
 
 - check if observedGeneration is present before comparing with generation for custom resources

lib/krane/cluster_resource_discovery.rb

@@ -19,12 +19,9 @@ def crds
     end
 
     def prunable_resources(namespaced:)
-      black_list = %w(Namespace Node ControllerRevision Event Elasticsearch)
+      black_list = %w(Namespace Node ControllerRevision Event)
       fetch_resources(namespaced: namespaced).map do |resource|
         next unless resource["verbs"].one? { |v| v == "delete" }
-        if resource["kind"] == "Elasticsearch"
-          StatsD.client.increment('elasticsearch_resource_deletion_attempt.increment', tags: %W(context:#{context} namespace:#{namespace}))
-        end
         next if black_list.include?(resource["kind"])
         [resource["apigroup"], resource["version"], resource["kind"]].compact.join("/")
       end.compact

lib/krane/kubernetes_resource/custom_resource.rb

@@ -39,7 +39,7 @@ def failure_message
     end
 
     def timeout_message
-      if observed_generation.present? && rollout_conditions && current_generation != observed_generation
+      if rollout_conditions && current_generation != observed_generation
         TIMEOUT_MESSAGE_DIFFERENT_GENERATIONS
       else
         super

lib/krane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Krane
-  VERSION = "3.8.1"
+  VERSION = "3.9.0"
 end

test/unit/cluster_resource_discovery_test.rb

@@ -3,7 +3,6 @@
 
 class ClusterResourceDiscoveryTest < Krane::TestCase
   include ClusterResourceDiscoveryHelper
-  include StatsD::Instrument::Assertions
 
   def test_fetch_resources_failure
     crd = mocked_cluster_resource_discovery(success: false)
@@ -50,7 +49,7 @@ def test_prunable_namespaced_resources
     %w(ConfigMap CronJob Deployment).each do |expected_kind|
       assert(kinds.one? { |k| k.include?(expected_kind) })
     end
-    %w(controllerrevision event elasticsearch).each do |black_listed_kind|
+    %w(controllerrevision event).each do |black_listed_kind|
       assert_empty(kinds.select { |k| k.downcase.include?(black_listed_kind) })
     end
   end
@@ -62,14 +61,4 @@ def test_prunable_namespaced_resources_apply_group_version_kind_overrides
       assert(kinds.one? { |k| k.include?(expected_kind) })
     end
   end
-
-  def test_elasticsearch_statsd_increment_not_emitted_when_no_elasticsearch
-    crd = mocked_cluster_resource_discovery
-    metrics = capture_statsd_calls(client: Krane::StatsD.client) do
-      crd.prunable_resources(namespaced: true)
-    end
-
-    increment_metric = metrics.find { |m| m.name == 'Krane.elasticsearch_resource_deletion_attempt.increment' && m.type == :c }
-    assert_nil(increment_metric, "Expected elasticsearch_resource_deletion_attempt.increment NOT to be emitted when no Elasticsearch exists")
-  end
 end

test/unit/krane/kubernetes_resource/custom_resource_definition_test.rb

@@ -159,20 +159,11 @@ def test_instance_timeout_annotation
   end
 
   def test_instance_timeout_messages_with_rollout_conditions
-    rollout_conditions = {
-      success_conditions: [
-        {
-          path: "$.status.conditions[?(@.type == 'Ready')].status",
-          value: "True",
-        },
-      ],
-    }.to_json
-
     crd = build_crd(crd_spec.merge(
       "metadata" => {
         "name" => "unittests.stable.example.io",
         "annotations" => {
-          rollout_conditions_annotation_key => rollout_conditions,
+          rollout_conditions_annotation_key => "true",
         },
       },
     ))
@@ -185,12 +176,12 @@ def test_instance_timeout_messages_with_rollout_conditions
         },
       })
 
-    cr.expects(:current_generation).at_least_once.returns(1)
-    cr.expects(:observed_generation).at_least_once.returns(1)
+    cr.expects(:current_generation).returns(1)
+    cr.expects(:observed_generation).returns(1)
     assert_equal(cr.timeout_message, Krane::KubernetesResource::STANDARD_TIMEOUT_MESSAGE)
 
-    cr.expects(:current_generation).at_least_once.returns(1)
-    cr.expects(:observed_generation).at_least_once.returns(2)
+    cr.expects(:current_generation).returns(1)
+    cr.expects(:observed_generation).returns(2)
     assert_equal(cr.timeout_message, Krane::CustomResource::TIMEOUT_MESSAGE_DIFFERENT_GENERATIONS)
   end