Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions api/policies.kyverno.io/v1alpha1/conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,16 @@ type ConditionStatus struct {
Message string `json:"message"`
}

// SetReadyByCondition sets the condition status using observedGeneration = 0.
// A value of 0 means "unset / legacy behavior" and is provided for backward
// compatibility with callers that do not yet track the reconciled generation.
// Prefer SetReadyByConditionAndObservedGeneration when the actual resource
// generation is available.
func (status *ConditionStatus) SetReadyByCondition(c PolicyConditionType, s metav1.ConditionStatus, message string) {
status.SetReadyByConditionAndObservedGeneration(c, s, message, 0)
}

Comment thread
sandert-k8s marked this conversation as resolved.
func (status *ConditionStatus) SetReadyByConditionAndObservedGeneration(c PolicyConditionType, s metav1.ConditionStatus, message string, observedGeneration int64) {
reason := "Succeeded"
if s != metav1.ConditionTrue {
reason = "Failed"
Expand All @@ -42,6 +51,7 @@ func (status *ConditionStatus) SetReadyByCondition(c PolicyConditionType, s meta
Status: s,
Message: message,
LastTransitionTime: metav1.NewTime(time.Now().Truncate(time.Second)),
ObservedGeneration: observedGeneration,
}
meta.SetStatusCondition(&status.Conditions, newCondition)
}
Expand Down
37 changes: 37 additions & 0 deletions api/policies.kyverno.io/v1alpha1/conditions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,40 @@ func TestConditionStatus_SetReadyByCondition_False(t *testing.T) {
assert.Equal(t, "Failed", got.Reason)
assert.Equal(t, "dummy", got.Message)
}

func TestConditionStatus_SetReadyByConditionAndObservedGeneration(t *testing.T) {
var status ConditionStatus
status.SetReadyByConditionAndObservedGeneration(PolicyConditionTypeWebhookConfigured, metav1.ConditionTrue, "dummy", 3)
got := meta.FindStatusCondition(status.Conditions, string(PolicyConditionTypeWebhookConfigured))
assert.NotNil(t, got)
assert.Equal(t, int64(3), got.ObservedGeneration)
}

func TestConditionStatus_SetReadyByConditionAndObservedGeneration_Updated(t *testing.T) {
var status ConditionStatus
status.SetReadyByConditionAndObservedGeneration(PolicyConditionTypeWebhookConfigured, metav1.ConditionTrue, "dummy", 1)
status.SetReadyByConditionAndObservedGeneration(PolicyConditionTypeWebhookConfigured, metav1.ConditionTrue, "dummy", 2)
got := meta.FindStatusCondition(status.Conditions, string(PolicyConditionTypeWebhookConfigured))
assert.NotNil(t, got)
assert.Equal(t, int64(2), got.ObservedGeneration)
}
Comment thread
sandert-k8s marked this conversation as resolved.

// TestConditionStatus_WithRealObjectGeneration verifies that a real Kubernetes
// object's generation is correctly propagated to observedGeneration in the
// condition status, simulating a full reconciliation flow.
func TestConditionStatus_WithRealObjectGeneration(t *testing.T) {
obj := ValidatingPolicy{}
obj.Generation = 5

var status ConditionStatus
status.SetReadyByConditionAndObservedGeneration(
PolicyConditionTypeWebhookConfigured,
metav1.ConditionTrue,
"reconciled",
obj.GetGeneration(),
)

got := meta.FindStatusCondition(status.Conditions, string(PolicyConditionTypeWebhookConfigured))
assert.NotNil(t, got)
assert.Equal(t, obj.GetGeneration(), got.ObservedGeneration)
}