update

Author: leon-ape

controllers/apps/component/transformer_component_workload_ops.go

@@ -453,7 +453,7 @@ func (r *componentWorkloadOps) handleReconfigure(transCtx *componentTransformCon
 			action     *appsv1.Action
 			actionName string
 		)
-		if tpl.ExternalManaged != nil && *tpl.ExternalManaged {
+		if ptr.Deref(tpl.ExternalManaged, false) {
 			if tpl.Reconfigure == nil {
 				return // disabled by the external system
 			}

controllers/parameters/combine_upgrade_policy_test.go

@@ -53,7 +53,6 @@ var _ = Describe("Reconfigure CombineSyncPolicy", func() {
 			Expect(upgradePolicyMap[parametersv1alpha1.DynamicReloadAndRestartPolicy]).ShouldNot(BeNil())
 
 			mockParam := newMockReconfigureParams("restartPolicy", k8sMockClient.Client(),
-				withMockInstanceSet(2, nil),
 				withConfigSpec("for_test", map[string]string{
 					"key": "value",
 				}),
@@ -71,7 +70,6 @@ var _ = Describe("Reconfigure CombineSyncPolicy", func() {
 			}
 
 			mockParam := newMockReconfigureParams("restartPolicy", k8sMockClient.Client(),
-				withMockInstanceSet(2, nil),
 				withConfigSpec("for_test", map[string]string{
 					"key": "value",
 				}),

controllers/parameters/config_reconcile_wrapper.go

@@ -25,11 +25,9 @@ import (
 
 	appsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
-	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/controller/component"
 	"github.com/apecloud/kubeblocks/pkg/controller/render"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
-	"github.com/apecloud/kubeblocks/pkg/generics"
 	"github.com/apecloud/kubeblocks/pkg/parameters"
 )
 
@@ -41,8 +39,6 @@ type ReconcileContext struct {
 	ConfigMap        *corev1.ConfigMap
 	BuiltinComponent *component.SynthesizedComponent
 
-	InstanceSetList []workloads.InstanceSet
-
 	ConfigRender   *parametersv1alpha1.ParamConfigRenderer
 	ParametersDefs map[string]*parametersv1alpha1.ParametersDefinition
 }
@@ -67,26 +63,11 @@ func (c *ReconcileContext) GetRelatedObjects() error {
 	return c.Cluster().
 		ComponentAndComponentDef().
 		ComponentSpec().
-		Workload().
 		SynthesizedComponent().
 		ParametersDefinitions().
 		Complete()
 }
 
-func (c *ReconcileContext) Workload() *ReconcileContext {
-	instanceSetFn := func() (err error) {
-		c.InstanceSetList, err = retrieveRelatedComponentsByConfigmap(
-			c.Client,
-			c.Context,
-			generics.InstanceSetSignature,
-			client.ObjectKeyFromObject(c.ConfigMap),
-			client.InNamespace(c.Namespace),
-			c.MatchingLabels)
-		return
-	}
-	return c.Wrap(instanceSetFn)
-}
-
 func (c *ReconcileContext) SynthesizedComponent() *ReconcileContext {
 	return c.Wrap(func() (err error) {
 		// build synthesized component for the component

controllers/parameters/config_related_helper.go

@@ -35,21 +35,7 @@ import (
 	"github.com/apecloud/kubeblocks/pkg/parameters/core"
 )
 
-// GetComponentPods gets all pods of the component.
-func GetComponentPods(params reconfigureContext) ([]corev1.Pod, error) {
-	componentPods := make([]corev1.Pod, 0)
-	for i := range params.InstanceSetUnits {
-		pods, err := intctrlutil.GetPodListByInstanceSet(params.Ctx, params.Client, &params.InstanceSetUnits[i])
-		if err != nil {
-			return nil, err
-		}
-		componentPods = append(componentPods, pods...)
-	}
-	return componentPods, nil
-}
-
-// CheckReconfigureUpdateProgress checks pods of the component is ready.
-func CheckReconfigureUpdateProgress(pods []corev1.Pod, configKey, version string) int32 {
+func checkReconfigureUpdateProgress(pods []corev1.Pod, configKey, version string) int32 {
 	var (
 		readyPods        int32 = 0
 		cfgAnnotationKey       = core.GenerateUniqKeyWithConfig(constant.UpgradeRestartAnnotationKey, configKey)
@@ -65,27 +51,27 @@ func CheckReconfigureUpdateProgress(pods []corev1.Pod, configKey, version string
 }
 
 func getPodsForOnlineUpdate(params reconfigureContext) ([]corev1.Pod, error) {
-	if len(params.InstanceSetUnits) > 1 {
-		return nil, core.MakeError("component require only one InstanceSet, actual %d components", len(params.InstanceSetUnits))
-	}
-
-	if len(params.InstanceSetUnits) == 0 {
-		return nil, nil
-	}
-
-	pods, err := GetComponentPods(params)
-	if err != nil {
+	var (
+		ctx     = params.Ctx
+		cli     = params.Client
+		podList = &corev1.PodList{}
+		opts    = []client.ListOption{
+			client.InNamespace(params.SynthesizedComponent.Namespace),
+			client.MatchingLabels(constant.GetCompLabels(params.SynthesizedComponent.ClusterName, params.SynthesizedComponent.Name)),
+		}
+	)
+	if err := cli.List(ctx, podList, opts...); err != nil {
 		return nil, err
 	}
 
 	if params.SynthesizedComponent != nil {
 		instanceset.SortPods(
-			pods,
+			podList.Items,
 			instanceset.ComposeRolePriorityMap(params.SynthesizedComponent.Roles),
 			true,
 		)
 	}
-	return pods, nil
+	return podList.Items, nil
 }
 
 func commonOnlineUpdateWithPod(pod *corev1.Pod, ctx context.Context, configSpec string, configFile string, updatedParams map[string]string) error {
@@ -235,21 +221,21 @@ func genReconfigureActionTasks(templateSpec *appsv1.ComponentFileTemplate, rctx
 }
 
 func buildReloadActionTask(reloadPolicy parametersv1alpha1.ReloadPolicy, templateSpec *appsv1.ComponentFileTemplate, rctx *ReconcileContext, pd *parametersv1alpha1.ParametersDefinition, configDescription *parametersv1alpha1.ComponentConfigDescription, patch *core.ConfigPatchInfo) reconfigureTask {
-	reCtx := reconfigureContext{
-		RequestCtx:           rctx.RequestCtx,
-		Client:               rctx.Client,
-		ConfigTemplate:       *templateSpec,
-		ConfigMap:            rctx.ConfigMap,
-		ParametersDef:        &pd.Spec,
-		ConfigDescription:    configDescription,
-		Cluster:              rctx.ClusterObj,
-		InstanceSetUnits:     rctx.InstanceSetList,
-		ClusterComponent:     rctx.ClusterComObj,
-		SynthesizedComponent: rctx.BuiltinComponent,
-		Patch:                patch,
+	return reconfigureTask{
+		ReloadPolicy: reloadPolicy,
+		taskCtx: reconfigureContext{
+			RequestCtx:           rctx.RequestCtx,
+			Client:               rctx.Client,
+			ConfigTemplate:       *templateSpec,
+			ConfigMap:            rctx.ConfigMap,
+			ParametersDef:        &pd.Spec,
+			ConfigDescription:    configDescription,
+			Cluster:              rctx.ClusterObj,
+			ClusterComponent:     rctx.ClusterComObj,
+			SynthesizedComponent: rctx.BuiltinComponent,
+			Patch:                patch,
+		},
 	}
-
-	return reconfigureTask{ReloadPolicy: reloadPolicy, taskCtx: reCtx}
 }
 
 func buildRestartTask(configTemplate *appsv1.ComponentFileTemplate, rctx *ReconcileContext) reconfigureTask {
@@ -262,7 +248,6 @@ func buildRestartTask(configTemplate *appsv1.ComponentFileTemplate, rctx *Reconc
 			ClusterComponent:     rctx.ClusterComObj,
 			Cluster:              rctx.ClusterObj,
 			SynthesizedComponent: rctx.BuiltinComponent,
-			InstanceSetUnits:     rctx.InstanceSetList,
 			ConfigMap:            rctx.ConfigMap,
 		},
 	}