Bump all obersved generation version of all conditions when object is deleting

Author: sarthakkothari

status/condition_set.go

@@ -113,6 +113,10 @@ func (c ConditionSet) Set(condition Condition) (modified bool) {
 	condition.ObservedGeneration = c.object.GetGeneration()
 	for _, cond := range c.object.GetConditions() {
 		if cond.Type != condition.Type {
+			// If we are deleting, we just bump all the observed generations
+			if !c.object.GetDeletionTimestamp().IsZero() {
+				cond.ObservedGeneration = c.object.GetGeneration()
+			}
 			conditions = append(conditions, cond)
 		} else {
 			foundCondition = true

status/condition_set_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/awslabs/operatorpkg/test"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/samber/lo"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -164,4 +165,34 @@ var _ = Describe("Conditions", func() {
 		Expect(testObject.StatusConditions().List()[len(testObject.StatusConditions().List())-3].Type).To(Equal(test.ConditionTypeBar))
 		Expect(testObject.StatusConditions().List()[len(testObject.StatusConditions().List())-4].Type).To(Equal(test.ConditionTypeFoo))
 	})
+
+	It("should bump generation of all conditions when deleting", func() {
+		testObject := test.Object(&test.CustomObject{})
+		// Conditions should be initialized
+		conditions := testObject.StatusConditions()
+		// Expect status to be unkown
+		Expect(conditions.Get(test.ConditionTypeFoo).GetStatus()).To(Equal(metav1.ConditionUnknown))
+		Expect(conditions.Get(test.ConditionTypeBar).GetStatus()).To(Equal(metav1.ConditionUnknown))
+		Expect(conditions.Root().GetStatus()).To(Equal(metav1.ConditionUnknown))
+
+		// set conditions to true and expect generation set
+		Expect(conditions.SetTrue(test.ConditionTypeFoo)).To(BeTrue())
+		Expect(conditions.SetTrue(test.ConditionTypeBar)).To(BeTrue())
+		Expect(conditions.Get(test.ConditionTypeFoo).Status).To(Equal(metav1.ConditionTrue))
+		Expect(conditions.Get(test.ConditionTypeBar).Status).To(Equal(metav1.ConditionTrue))
+		Expect(conditions.Get(test.ConditionTypeFoo).ObservedGeneration).To(Equal(int64(1)))
+		Expect(conditions.Get(test.ConditionTypeBar).ObservedGeneration).To(Equal(int64(1)))
+
+		// set deletion timestamp and bump observed generation
+		testObject.SetDeletionTimestamp(lo.ToPtr(metav1.Now()))
+		testObject.SetGeneration(2)
+
+		// set one condition to true again; ensure all the other conditions observed generation is bumped
+		// make sure root condition is also true and not unknown
+		Expect(conditions.SetTrue(test.ConditionTypeFoo)).To(BeTrue())
+		Expect(conditions.Get(test.ConditionTypeFoo).ObservedGeneration).To(Equal(int64(2)))
+		Expect(conditions.Get(test.ConditionTypeBar).ObservedGeneration).To(Equal(int64(2)))
+		Expect(conditions.Root().Status).To(Equal(metav1.ConditionTrue))
+		Expect(conditions.Root().ObservedGeneration).To(Equal(int64(2)))
+	})
 })