From 7e7ab55582bd87e8935facc13c89d377a766ef1f Mon Sep 17 00:00:00 2001
From: sophon <sophon@apecloud.com>
Date: Fri, 19 Jul 2024 09:58:57 +0800
Subject: [PATCH] configuration parameters do not take effect after rerenderd
 (#7833)

---
 pkg/controller/configuration/pipeline.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/controller/configuration/pipeline.go b/pkg/controller/configuration/pipeline.go
index 9724619f021..ace142b2d84 100644
--- a/pkg/controller/configuration/pipeline.go
+++ b/pkg/controller/configuration/pipeline.go
@@ -377,6 +377,10 @@ func (p *updatePipeline) Sync() *updatePipeline {
 			return p.Client.Create(p.Context, p.newCM)
 		case p.ConfigMapObj != nil:
 			patch := client.MergeFrom(p.ConfigMapObj)
+			if p.ConfigMapObj != nil {
+				p.newCM.Labels = intctrlutil.MergeMetadataMaps(p.newCM.Labels, p.ConfigMapObj.Labels)
+				p.newCM.Annotations = intctrlutil.MergeMetadataMaps(p.newCM.Annotations, p.ConfigMapObj.Annotations)
+			}
 			return p.Client.Patch(p.Context, p.newCM, patch)
 		}
 		return core.MakeError("unexpected condition")