Skip to content

fix: skip config-manager image rollback #10034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kizuna-lek merged 4 commits into from
Jan 30, 2026
Merged

fix: skip config-manager image rollback #10034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e1be3c
fix: skip config-manager image rollback
kizuna-lek Jan 29, 2026
44836d4
fix: update its container in advance to prevent rollback
kizuna-lek Jan 30, 2026
d288b01
fix
kizuna-lek Jan 30, 2026
53af045
fix
kizuna-lek Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/apps/component/transformer_component_reload_sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ func (t *componentReloadSidecarTransformer) Transform(ctx graph.TransformContext
ClusterName: builtinComp.ClusterName,
ComponentName: builtinComp.Name,
}
return configctrl.BuildReloadActionContainer(reconcileCtx, cluster, builtinComp, transCtx.CompDef)
return configctrl.BuildReloadActionContainer(reconcileCtx, cluster, builtinComp, transCtx.CompDef, transCtx.RunningWorkload)
}
30 changes: 29 additions & 1 deletion pkg/parameters/config_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (

appsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
workloadsv1 "github.com/apecloud/kubeblocks/apis/workloads/v1"
"github.com/apecloud/kubeblocks/pkg/constant"
"github.com/apecloud/kubeblocks/pkg/controller/component"
"github.com/apecloud/kubeblocks/pkg/controller/factory"
Expand Down Expand Up @@ -333,7 +334,8 @@ func ReloadStaticParameters(pd *parametersv1alpha1.ParametersDefinitionSpec) boo

// BuildReloadActionContainer build the configmgr sidecar container and update it
// into PodSpec if configuration reload option is on
func BuildReloadActionContainer(resourceCtx *render.ResourceCtx, cluster *appsv1.Cluster, synthesizedComp *component.SynthesizedComponent, cmpd *appsv1.ComponentDefinition) error {
func BuildReloadActionContainer(resourceCtx *render.ResourceCtx, cluster *appsv1.Cluster,
synthesizedComp *component.SynthesizedComponent, cmpd *appsv1.ComponentDefinition, itsObj client.Object) error {
var (
err error
buildParams *cfgcm.CfgManagerBuildParams
Expand Down Expand Up @@ -384,6 +386,32 @@ func BuildReloadActionContainer(resourceCtx *render.ResourceCtx, cluster *appsv1
if len(buildParams.ToolsContainers) > 0 {
podSpec.InitContainers = append(podSpec.InitContainers, buildParams.ToolsContainers...)
}

getRunningIts := func() *workloadsv1.InstanceSet {
if itsObj == nil {
return nil
}
return itsObj.(*workloadsv1.InstanceSet)
}

// Update the runningITS container in advance to prevent it from being rollback.
if runningITS := getRunningIts(); runningITS != nil {
for i, c := range runningITS.Spec.Template.Spec.Containers {
if c.Name == container.Name {
runningITS.Spec.Template.Spec.Containers[i].Image = container.Image
break
}
}
for _, tc := range buildParams.ToolsContainers {
for j, ic := range runningITS.Spec.Template.Spec.InitContainers {
if ic.Name == tc.Name {
runningITS.Spec.Template.Spec.InitContainers[j].Image = tc.Image
break
}
}
}
}

filter := func(c *corev1.Container) bool {
names := []string{container.Name}
for _, cc := range buildParams.ToolsContainers {
Expand Down