Skip to content

Check if observed_generation.present? #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvallati merged 1 commit into from
Oct 24, 2025
Merged

Check if observed_generation.present? #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## next

## 3.8.1

- check if observedGeneration is present before comparing with generation for custom resources

## 3.8.0

- Add Elasticsearch resource to the black list so it is not marked for deletion
Expand Down
2 changes: 1 addition & 1 deletion lib/krane/kubernetes_resource/custom_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def failure_message
end

def timeout_message
if rollout_conditions && current_generation != observed_generation
if observed_generation.present? && rollout_conditions && current_generation != observed_generation
TIMEOUT_MESSAGE_DIFFERENT_GENERATIONS
else
super
Expand Down
2 changes: 1 addition & 1 deletion lib/krane/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Krane
VERSION = "3.8.0"
VERSION = "3.8.1"
end
19 changes: 14 additions & 5 deletions test/unit/krane/kubernetes_resource/custom_resource_definition_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,20 @@ 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 => "true",
rollout_conditions_annotation_key => rollout_conditions,
},
},
))
Expand All @@ -176,12 +185,12 @@ def test_instance_timeout_messages_with_rollout_conditions
},
})

cr.expects(:current_generation).returns(1)
cr.expects(:observed_generation).returns(1)
cr.expects(:current_generation).at_least_once.returns(1)
cr.expects(:observed_generation).at_least_once.returns(1)
assert_equal(cr.timeout_message, Krane::KubernetesResource::STANDARD_TIMEOUT_MESSAGE)

cr.expects(:current_generation).returns(1)
cr.expects(:observed_generation).returns(2)
cr.expects(:current_generation).at_least_once.returns(1)
cr.expects(:observed_generation).at_least_once.returns(2)
assert_equal(cr.timeout_message, Krane::CustomResource::TIMEOUT_MESSAGE_DIFFERENT_GENERATIONS)
end

Expand Down