From 17a05de71081c8c567f3879758a5d2a5a4a48f18 Mon Sep 17 00:00:00 2001 From: old prince <26155892+LiuFang07@users.noreply.github.com> Date: Tue, 3 Jan 2023 10:46:59 +0800 Subject: [PATCH] Fix:Dry-run from revision application,Problems caused by resource version lower than the current version (#5246) Signed-off-by: old.prince Signed-off-by: old.prince --- pkg/apiserver/domain/service/application.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/apiserver/domain/service/application.go b/pkg/apiserver/domain/service/application.go index 826e81de456..c6083993579 100644 --- a/pkg/apiserver/domain/service/application.go +++ b/pkg/apiserver/domain/service/application.go @@ -1513,6 +1513,13 @@ func (c *applicationServiceImpl) DryRunAppOrRevision(ctx context.Context, appMod } case "REVISION": app, _, err = c.getAppModelFromRevision(ctx, appModel.Name, dryRunReq.Version) + originalApp := &v1beta1.Application{} + if err := c.KubeClient.Get(ctx, types.NamespacedName{ + Name: app.Name, + Namespace: app.Namespace, + }, originalApp); err == nil { + app.ResourceVersion = originalApp.ResourceVersion + } if err != nil { return nil, err }