Check ObservedGeneration and generation before to check (#1360)

Signed-off-by: Alvaro Neira Ayuso <alvaron@vmware.com>

Author: alvneiayu

integration/controller_test.go

@@ -56,6 +56,10 @@ func getStatus(ss *ssv1alpha1.SealedSecret) *ssv1alpha1.SealedSecretStatus {
 	return ss.Status
 }
 
+func getObservedGeneration(ss *ssv1alpha1.SealedSecret) int64 {
+	return ss.Status.ObservedGeneration
+}
+
 // get the first owner name assuming there is only one owner which is the sealed-secret object
 func getFirstOwnerName(s *v1.Secret) string {
 	return s.OwnerReferences[0].Name
@@ -230,6 +234,9 @@ var _ = Describe("create", func() {
 				Eventually(func() (*ssv1alpha1.SealedSecret, error) {
 					return ssc.BitnamiV1alpha1().SealedSecrets(ns).Get(context.Background(), secretName, metav1.GetOptions{})
 				}, Timeout, PollingInterval).ShouldNot(WithTransform(getStatus, BeNil()))
+				Eventually(func() (*ssv1alpha1.SealedSecret, error) {
+					return ssc.BitnamiV1alpha1().SealedSecrets(ns).Get(context.Background(), secretName, metav1.GetOptions{})
+				}, Timeout, PollingInterval).Should(WithTransform(getObservedGeneration, Equal(int64(2))))
 			})
 		})
 

pkg/controller/controller.go

@@ -412,9 +412,9 @@ func (c *Controller) updateSealedSecretStatus(ssecret *ssv1alpha1.SealedSecret,
 		ssecret.Status = &ssv1alpha1.SealedSecretStatus{}
 	}
 
-	ssecret.Status.ObservedGeneration = ssecret.ObjectMeta.Generation
 	updatedRequired := updateSealedSecretsStatusConditions(ssecret.Status, unsealError)
-	if updatedRequired {
+	if updatedRequired || (ssecret.Status.ObservedGeneration != ssecret.ObjectMeta.Generation) {
+		ssecret.Status.ObservedGeneration = ssecret.ObjectMeta.Generation
 		_, err := c.ssclient.SealedSecrets(ssecret.GetObjectMeta().GetNamespace()).UpdateStatus(context.Background(), ssecret, metav1.UpdateOptions{})
 		return err
 	}