fix: failed to reconfigure for the stateless component (#5439)

apecloud · Oct 16, 2023 · 077f4b8 · 077f4b8
1 parent b7d0de2
commit 077f4b8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/controllers/apps/configuration/config_reconcile_wrapper.go b/controllers/apps/configuration/config_reconcile_wrapper.go
@@ -80,18 +80,19 @@ func (c *configReconcileContext) GetRelatedObjects() error {
 		ClusterVer().
 		ClusterComponent().
 		ClusterDefComponent().
-		StatefulSet().
 		RSM().
+		StatefulSet().
 		Deployment().
 		Complete()
 }
 
 func (c *configReconcileContext) StatefulSet() *configReconcileContext {
 	stsFn := func() (err error) {
 		dComp := c.ClusterDefComObj
-		if dComp == nil || dComp.WorkloadType == appsv1alpha1.Stateless {
+		if dComp == nil || dComp.WorkloadType == appsv1alpha1.Stateless || len(c.RSMList) != 0 {
 			return
 		}
+
 		c.StatefulSets, c.Containers, err = retrieveRelatedComponentsByConfigmap(
 			c.Client,
 			c.Context,
@@ -124,6 +125,7 @@ func (c *configReconcileContext) RSM() *configReconcileContext {
 		}
 
 		// fix uid mismatch bug: convert rsm to sts
+		// NODE: all components use the StatefulSet
 		for _, rsm := range c.RSMList {
 			var stsObject appv1.StatefulSet
 			if err = c.Client.Get(c.Context, client.ObjectKeyFromObject(components.ConvertRSMToSTS(&rsm)), &stsObject); err != nil {
@@ -139,9 +141,10 @@ func (c *configReconcileContext) RSM() *configReconcileContext {
 func (c *configReconcileContext) Deployment() *configReconcileContext {
 	deployFn := func() (err error) {
 		dComp := c.ClusterDefComObj
-		if dComp == nil || dComp.WorkloadType != appsv1alpha1.Stateless {
+		if dComp == nil || dComp.WorkloadType != appsv1alpha1.Stateless || len(c.RSMList) != 0 {
 			return
 		}
+
 		c.Deployments, c.Containers, err = retrieveRelatedComponentsByConfigmap(
 			c.Client,
 			c.Context,

diff --git a/controllers/apps/configuration/policy_util.go b/controllers/apps/configuration/policy_util.go
@@ -59,13 +59,7 @@ func getReplicationSetPods(params reconfigureParams) ([]corev1.Pod, error) {
 func GetComponentPods(params reconfigureParams) ([]corev1.Pod, error) {
 	componentPods := make([]corev1.Pod, 0)
 	for i := range params.ComponentUnits {
-		pods, err := common.GetPodListByStatefulSetWithSelector(params.Ctx.Ctx,
-			params.Client,
-			&params.ComponentUnits[i],
-			client.MatchingLabels{
-				constant.KBAppComponentLabelKey: params.ClusterComponent.Name,
-				constant.AppInstanceLabelKey:    params.Cluster.Name,
-			})
+		pods, err := common.GetPodListByStatefulSet(params.Ctx.Ctx, params.Client, &params.ComponentUnits[i])
 		if err != nil {
 			return nil, err
 		}

diff --git a/controllers/apps/configuration/reconfigure_controller.go b/controllers/apps/configuration/reconfigure_controller.go
@@ -219,6 +219,7 @@ func (r *ReconfigureReconciler) sync(reqCtx intctrlutil.RequestCtx, configMap *c
 		ContainerNames:           reconcileContext.Containers,
 		ComponentUnits:           reconcileContext.StatefulSets,
 		DeploymentUnits:          reconcileContext.Deployments,
+		RSMList:                  reconcileContext.RSMList,
 		Component:                reconcileContext.ClusterDefComObj,
 		ClusterComponent:         reconcileContext.ClusterComObj,
 		Restart:                  forceRestart || !cfgcm.IsSupportReload(configConstraint.Spec.ReloadOptions),

diff --git a/controllers/apps/configuration/reconfigure_policy.go b/controllers/apps/configuration/reconfigure_policy.go
@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
+	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1alpha1"
 	"github.com/apecloud/kubeblocks/internal/configuration/core"
 	cfgproto "github.com/apecloud/kubeblocks/internal/configuration/proto"
 	"github.com/apecloud/kubeblocks/internal/configuration/util"
@@ -104,9 +105,10 @@ type reconfigureParams struct {
 
 	// List of StatefulSets using this config template.
 	ComponentUnits []appsv1.StatefulSet
-
 	// List of Deployment using this config template.
 	DeploymentUnits []appsv1.Deployment
+	// List of ReplicatedStateMachine using this config template.
+	RSMList []workloads.ReplicatedStateMachine
 }
 
 var (

diff --git a/controllers/apps/configuration/simple_policy.go b/controllers/apps/configuration/simple_policy.go
@@ -53,8 +53,14 @@ func (s *simplePolicy) Upgrade(params reconfigureParams) (ReturnedStatus, error)
 		funcs = GetReplicationRollingUpgradeFuncs()
 		compLists = fromStatefulSetObjects(params.ComponentUnits)
 	case appsv1alpha1.Stateless:
-		funcs = GetDeploymentRollingUpgradeFuncs()
-		compLists = fromDeploymentObjects(params.DeploymentUnits)
+		// NODE: stateless component uses the StatefulSet object
+		if len(params.RSMList) != 0 {
+			funcs = GetStatefulSetRollingUpgradeFuncs()
+			compLists = fromStatefulSetObjects(params.ComponentUnits)
+		} else {
+			funcs = GetDeploymentRollingUpgradeFuncs()
+			compLists = fromDeploymentObjects(params.DeploymentUnits)
+		}
 	}
 	return restartAndCheckComponent(params, funcs, compLists)
 }