From c6a947cfd97bb17512627ac1a64b3912ef17ea77 Mon Sep 17 00:00:00 2001 From: sophon Date: Wed, 16 Jul 2025 18:20:48 +0800 Subject: [PATCH] fix: update config-manager related-container image --- controllers/apps/component/transformer_component_workload.go | 4 ++++ pkg/controller/configuration/utils.go | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/controllers/apps/component/transformer_component_workload.go b/controllers/apps/component/transformer_component_workload.go index 54232a98286..2bc7473efed 100644 --- a/controllers/apps/component/transformer_component_workload.go +++ b/controllers/apps/component/transformer_component_workload.go @@ -37,6 +37,7 @@ import ( appsutil "github.com/apecloud/kubeblocks/controllers/apps/util" "github.com/apecloud/kubeblocks/pkg/constant" "github.com/apecloud/kubeblocks/pkg/controller/component" + configctrl "github.com/apecloud/kubeblocks/pkg/controller/configuration" "github.com/apecloud/kubeblocks/pkg/controller/factory" "github.com/apecloud/kubeblocks/pkg/controller/graph" "github.com/apecloud/kubeblocks/pkg/controller/model" @@ -426,6 +427,9 @@ func checkNRollbackProtoImages(itsObj, itsProto *workloads.InstanceSet) { if component.IsKBAgentContainer(&c) { continue } + if configctrl.IsConfigManagerContainer(c.Name) { + continue + } images[i][c.Name] = c.Image } } diff --git a/pkg/controller/configuration/utils.go b/pkg/controller/configuration/utils.go index 9f61fab0914..388bb10b9f2 100644 --- a/pkg/controller/configuration/utils.go +++ b/pkg/controller/configuration/utils.go @@ -20,6 +20,7 @@ along with this program. If not, see . package configuration import ( + "github.com/apecloud/kubeblocks/pkg/constant" "github.com/apecloud/kubeblocks/pkg/controller/multicluster" ) @@ -38,3 +39,7 @@ func copyMap(data map[string]string) map[string]string { } return r } + +func IsConfigManagerContainer(containerName string) bool { + return containerName == installConfigMangerToolContainerName || containerName == constant.ConfigSidecarName +}