From a8496ae432d611329cb707cfb3375f0bfd2b9751 Mon Sep 17 00:00:00 2001 From: "dengqian.ljw" Date: Wed, 4 Nov 2020 16:22:21 +0800 Subject: [PATCH] fix observedGeneration mismatch between Component and ControllerRevision Signed-off-by: dengqian.ljw --- .../v1alpha2/applicationconfiguration/component.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controller/v1alpha2/applicationconfiguration/component.go b/pkg/controller/v1alpha2/applicationconfiguration/component.go index f571500c..fea15bbf 100644 --- a/pkg/controller/v1alpha2/applicationconfiguration/component.go +++ b/pkg/controller/v1alpha2/applicationconfiguration/component.go @@ -143,6 +143,10 @@ func (c *ComponentHandler) createControllerRevision(mt metav1.Object, obj runtim nextRevision := curRevision + 1 revisionName := ConstructRevisionName(mt.GetName(), nextRevision) + if comp.Status.ObservedGeneration != comp.Generation { + comp.Status.ObservedGeneration = comp.Generation + } + comp.Status.LatestRevision = &v1alpha2.Revision{ Name: revisionName, Revision: nextRevision, @@ -175,10 +179,6 @@ func (c *ComponentHandler) createControllerRevision(mt metav1.Object, obj runtim return false } - if comp.Status.ObservedGeneration != comp.Generation { - comp.Status.ObservedGeneration = comp.Generation - } - err = c.Client.Status().Update(context.Background(), comp) if err != nil { c.Logger.Info(fmt.Sprintf("update component status latestRevision %s err %v", revisionName, err), "componentName", mt.GetName())