chore: clean up some useless code (#9881)

leon-inf · web-flow · commit 67b7428f6e76 · 2025-11-20T15:28:01.000+08:00
diff --git a/cmd/kbagent/main.go b/cmd/kbagent/main.go
@@ -35,7 +35,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	kzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	kbagent "github.com/apecloud/kubeblocks/pkg/kbagent"
+	"github.com/apecloud/kubeblocks/pkg/kbagent"
 	"github.com/apecloud/kubeblocks/pkg/kbagent/server"
 	viper "github.com/apecloud/kubeblocks/pkg/viperx"
 )
diff --git a/controllers/parameters/config_reconcile_wrapper.go b/controllers/parameters/config_reconcile_wrapper.go
@@ -37,12 +37,10 @@ type ReconcileContext struct {
 	intctrlutil.RequestCtx
 	parameters.ResourceFetcher[ReconcileContext]
 
-	Name             string
 	MatchingLabels   client.MatchingLabels
 	ConfigMap        *corev1.ConfigMap
 	BuiltinComponent *component.SynthesizedComponent
 
-	Containers      []string
 	InstanceSetList []workloads.InstanceSet
 
 	ConfigRender   *parametersv1alpha1.ParamConfigRenderer
@@ -53,15 +51,13 @@ func newParameterReconcileContext(reqCtx intctrlutil.RequestCtx,
 	resourceCtx *render.ResourceCtx,
 	cm *corev1.ConfigMap,
 	cluster *appsv1.Cluster,
-	configSpecName string,
 	matchingLabels client.MatchingLabels) *ReconcileContext {
 	configContext := ReconcileContext{
 		ResourceFetcher: parameters.ResourceFetcher[ReconcileContext]{
 			ClusterObj: cluster,
 		},
 		RequestCtx:     reqCtx,
 		ConfigMap:      cm,
-		Name:           configSpecName,
 		MatchingLabels: matchingLabels,
 	}
 	return configContext.Init(resourceCtx, &configContext)
@@ -79,10 +75,9 @@ func (c *ReconcileContext) GetRelatedObjects() error {
 
 func (c *ReconcileContext) Workload() *ReconcileContext {
 	instanceSetFn := func() (err error) {
-		c.InstanceSetList, c.Containers, err = retrieveRelatedComponentsByConfigmap(
+		c.InstanceSetList, err = retrieveRelatedComponentsByConfigmap(
 			c.Client,
 			c.Context,
-			c.Name,
 			generics.InstanceSetSignature,
 			client.ObjectKeyFromObject(c.ConfigMap),
 			client.InNamespace(c.Namespace),
diff --git a/controllers/parameters/config_related_helper.go b/controllers/parameters/config_related_helper.go
@@ -32,22 +32,20 @@ import (
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 	"github.com/apecloud/kubeblocks/pkg/generics"
 	"github.com/apecloud/kubeblocks/pkg/parameters/core"
-	cfgutil "github.com/apecloud/kubeblocks/pkg/parameters/util"
 )
 
-func retrieveRelatedComponentsByConfigmap[T generics.Object, PT generics.PObject[T], L generics.ObjList[T], PL generics.PObjList[T, L]](cli client.Client, ctx context.Context, configSpecName string, _ func(T, PT, L, PL), cfg client.ObjectKey, opts ...client.ListOption) ([]T, []string, error) {
+func retrieveRelatedComponentsByConfigmap[T generics.Object, PT generics.PObject[T], L generics.ObjList[T], PL generics.PObjList[T, L]](cli client.Client, ctx context.Context, _ func(T, PT, L, PL), cfg client.ObjectKey, opts ...client.ListOption) ([]T, error) {
 	var objList L
 	if err := cli.List(ctx, PL(&objList), opts...); err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	objs := make([]T, 0)
-	containers := cfgutil.NewSet()
 	items := toObjects[T, L, PL](&objList)
 	for i := range items {
 		obj := toResourceObject(&items[i])
 		if objs == nil {
-			return nil, nil, core.MakeError("failed to convert to resource object")
+			return nil, core.MakeError("failed to convert to resource object")
 		}
 		podTemplate := transformPodTemplate(obj)
 		if podTemplate == nil {
@@ -65,10 +63,9 @@ func retrieveRelatedComponentsByConfigmap[T generics.Object, PT generics.PObject
 			})
 		if len(contains) > 0 {
 			objs = append(objs, items[i])
-			containers.Add(contains...)
 		}
 	}
-	return objs, containers.AsSlice(), nil
+	return objs, nil
 }
 
 func transformPodTemplate(obj client.Object) *corev1.PodTemplateSpec {
diff --git a/controllers/parameters/configuration_test.go b/controllers/parameters/configuration_test.go
@@ -35,7 +35,6 @@ import (
 	"github.com/apecloud/kubeblocks/pkg/controller/builder"
 	"github.com/apecloud/kubeblocks/pkg/controller/component"
 	"github.com/apecloud/kubeblocks/pkg/generics"
-	"github.com/apecloud/kubeblocks/pkg/parameters/core"
 	testapps "github.com/apecloud/kubeblocks/pkg/testutil/apps"
 	testparameters "github.com/apecloud/kubeblocks/pkg/testutil/parameters"
 	"github.com/apecloud/kubeblocks/test/testdata"
@@ -148,7 +147,6 @@ func mockReconcileResource() (*corev1.ConfigMap, *parametersv1alpha1.ParametersD
 		AddAppNameLabel(clusterName).
 		AddAppInstanceLabel(clusterName).
 		AddAppComponentLabel(defaultCompName).
-		AddAnnotations(core.GenerateTPLUniqLabelKeyWithConfig(configSpecName), configmap.Name).
 		Create(&testCtx).GetObject()
 
 	synthesizedComp, err := component.BuildSynthesizedComponent(testCtx.Ctx, testCtx.Cli, compDefObj, compObj)
diff --git a/controllers/parameters/parameter_controller.go b/controllers/parameters/parameter_controller.go
@@ -174,7 +174,7 @@ func (r *ParameterReconciler) generateParameterTaskContext(
 					Namespace:     parameter.Namespace,
 					ClusterName:   parameter.Spec.ClusterName,
 					ComponentName: compName,
-				}, nil, cluster, "", nil))
+				}, nil, cluster, nil))
 		}
 	}
 	return rctxs, params, nil
diff --git a/controllers/parameters/policy_util.go b/controllers/parameters/policy_util.go
@@ -318,7 +318,6 @@ func buildReloadActionTask(reloadPolicy parametersv1alpha1.ReloadPolicy, templat
 		ParametersDef:            &pd.Spec,
 		ConfigDescription:        configDescription,
 		Cluster:                  rctx.ClusterObj,
-		ContainerNames:           rctx.Containers,
 		InstanceSetUnits:         rctx.InstanceSetList,
 		ClusterComponent:         rctx.ClusterComObj,
 		SynthesizedComponent:     rctx.BuiltinComponent,
diff --git a/controllers/parameters/reconfigure_controller.go b/controllers/parameters/reconfigure_controller.go
@@ -178,7 +178,6 @@ func (r *ReconfigureReconciler) sync(reqCtx intctrlutil.RequestCtx, configMap *c
 		},
 		configMap,
 		nil,
-		resources.configSpec.Name,
 		resources.componentMatchLabels())
 	if err := rctx.GetRelatedObjects(); err != nil {
 		return intctrlutil.RequeueWithErrorAndRecordEvent(configMap, r.Recorder, err, reqCtx.Log)
diff --git a/controllers/parameters/reconfigure_policy.go b/controllers/parameters/reconfigure_policy.go
@@ -79,15 +79,9 @@ type reconfigureContext struct {
 	// Configmap object of the configuration template instance in the component.
 	ConfigMap *corev1.ConfigMap
 
-	// ConfigConstraint pointer
-	// ConfigConstraint *appsv1beta1.ConfigConstraintSpec
-
 	// For grpc factory
 	ReconfigureClientFactory createReconfigureClient
 
-	// List of containers using this config volume.
-	ContainerNames []string
-
 	ConfigDescription *parametersv1alpha1.ComponentConfigDescription
 	ParametersDef     *parametersv1alpha1.ParametersDefinitionSpec
 	Patch             *core.ConfigPatchInfo
diff --git a/controllers/parameters/types.go b/controllers/parameters/types.go
@@ -35,7 +35,6 @@ type createReconfigureClient func(addr string) (cfgproto.ReconfigureClient, erro
 type GetPodsFunc func(params reconfigureContext) ([]corev1.Pod, error)
 type RestartComponent func(client client.Client, ctx intctrlutil.RequestCtx, key string, version string, cluster *appsv1.Cluster, compName string) error
 
-type RestartContainerFunc func(pod *corev1.Pod, ctx context.Context, containerName []string, createConnFn createReconfigureClient) error
 type OnlineUpdatePodFunc func(pod *corev1.Pod, ctx context.Context, createClient createReconfigureClient, configSpec string, configFile string, updatedParams map[string]string) error
 
 // Node: Distinguish between implementation and interface.
diff --git a/pkg/constant/config.go b/pkg/constant/config.go
@@ -19,8 +19,6 @@ package constant
 const (
 	ConfigManagerToolPath = "/bin/reloader"
 
-	// ConfigurationTplLabelPrefixKey clusterdefinition using tpl
-	ConfigurationTplLabelPrefixKey         = "config.kubeblocks.io/tpl"
 	ConfigurationConstraintsLabelPrefixKey = "config.kubeblocks.io/constraints"
 
 	// CMInsLastReconfigurePhaseKey defines the current phase
diff --git a/pkg/kbagent/service/task_new_replica.go b/pkg/kbagent/service/task_new_replica.go
@@ -24,6 +24,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"strconv"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -114,5 +115,5 @@ func (s *newReplicaTask) connectToRemote(ctx context.Context) (net.Conn, error)
 	dialer := &net.Dialer{
 		Timeout: newReplicaConnectTimeoutSeconds * time.Second,
 	}
-	return dialer.Dial("tcp", fmt.Sprintf("%s:%d", s.task.Remote, s.task.Port))
+	return dialer.Dial("tcp", net.JoinHostPort(s.task.Remote, strconv.Itoa(int(s.task.Port))))
 }
diff --git a/pkg/parameters/configmanager/builder.go b/pkg/parameters/configmanager/builder.go
@@ -49,7 +49,6 @@ import (
 const (
 	configTemplateName = "reload.yaml"
 	scriptVolumePrefix = "cm-script-"
-	configVolumePrefix = "cm-config-"
 
 	scriptConfigField    = "scripts"
 	formatterConfigField = "formatterConfig"
diff --git a/pkg/parameters/configmanager/config_handler.go b/pkg/parameters/configmanager/config_handler.go
@@ -26,7 +26,6 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
 	parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
 	cfgcore "github.com/apecloud/kubeblocks/pkg/parameters/core"
 	cfgutil "github.com/apecloud/kubeblocks/pkg/parameters/util"
@@ -44,12 +43,7 @@ func CreateCombinedHandler(config string) (ConfigHandler, error) {
 		if tplTrigger == nil {
 			return nil, cfgcore.MakeError("tpl trigger is nil")
 		}
-		return createTPLScriptHandler(
-			configMeta.ConfigSpec.Name,
-			configMeta.TPLConfig,
-			[]string{configMeta.MountPoint},
-			backupPath,
-		)
+		return createTPLScriptHandler(configMeta.TPLConfig, []string{configMeta.MountPoint}, backupPath)
 	}
 
 	var h ConfigHandler
@@ -96,34 +90,9 @@ func (m *multiHandler) OnlineUpdate(ctx context.Context, name string, updatedPar
 	return cfgcore.MakeError("not found handler for config name: %s", name)
 }
 
-type configVolumeHandleMeta struct {
-	ConfigHandler
-
-	reloadType parametersv1alpha1.DynamicReloadType
-	configSpec appsv1alpha1.ComponentTemplateSpec
-
-	formatterConfig *parametersv1alpha1.FileFormatConfig
-}
-
-func (s *configVolumeHandleMeta) OnlineUpdate(_ context.Context, _ string, _ map[string]string) error {
-	return cfgcore.MakeError("not support online update")
-}
-
-func createConfigVolumeMeta(configSpecName string, reloadType parametersv1alpha1.DynamicReloadType, formatterConfig *parametersv1alpha1.FileFormatConfig) configVolumeHandleMeta {
-	return configVolumeHandleMeta{
-		reloadType: reloadType,
-		configSpec: appsv1alpha1.ComponentTemplateSpec{
-			Name: configSpecName,
-		},
-		formatterConfig: formatterConfig,
-	}
-}
-
 type shellCommandHandler struct {
-	configVolumeHandleMeta
-	command string
-	arg     []string
-
+	command    string
+	arg        []string
 	backupPath string
 	configMeta *ConfigSpecInfo
 }
@@ -179,20 +148,17 @@ func createExecHandler(command []string, configMeta *ConfigSpecInfo, backupPath
 		return nil, err
 	}
 
-	var formatterConfig *parametersv1alpha1.FileFormatConfig
 	if backupPath != "" && configMeta != nil && configMeta.ReloadAction != nil {
 		if err := checkAndBackup(*configMeta, []string{configMeta.MountPoint}, filter, backupPath); err != nil {
 			return nil, err
 		}
-		formatterConfig = &configMeta.FormatterConfig
 	}
 
 	shellTrigger := &shellCommandHandler{
-		command:                command[0],
-		arg:                    command[1:],
-		backupPath:             backupPath,
-		configMeta:             configMeta,
-		configVolumeHandleMeta: createConfigVolumeMeta(configMeta.ConfigSpec.Name, parametersv1alpha1.ShellType, formatterConfig),
+		command:    command[0],
+		arg:        command[1:],
+		backupPath: backupPath,
+		configMeta: configMeta,
 	}
 	return shellTrigger, nil
 }
@@ -215,13 +181,12 @@ func fromConfigSpecInfo(meta *ConfigSpecInfo) string {
 }
 
 type tplScriptHandler struct {
-	configVolumeHandleMeta
-
-	tplScripts string
-	tplContent string
-	engineType string
-	dsn        string
-	backupPath string
+	tplScripts      string
+	tplContent      string
+	engineType      string
+	dsn             string
+	backupPath      string
+	formatterConfig *parametersv1alpha1.FileFormatConfig
 }
 
 func (u *tplScriptHandler) OnlineUpdate(ctx context.Context, name string, updatedParams map[string]string) error {
@@ -234,7 +199,7 @@ func (u *tplScriptHandler) OnlineUpdate(ctx context.Context, name string, update
 		u.engineType, u.dsn)
 }
 
-func createTPLScriptHandler(name, configPath string, dirs []string, backupPath string) (ConfigHandler, error) {
+func createTPLScriptHandler(configPath string, dirs []string, backupPath string) (ConfigHandler, error) {
 	tplConfig := TPLScriptConfig{}
 	if err := cfgutil.FromYamlConfig(configPath, &tplConfig); err != nil {
 		return nil, err
@@ -263,12 +228,12 @@ func createTPLScriptHandler(name, configPath string, dirs []string, backupPath s
 		return nil, err
 	}
 	tplHandler := &tplScriptHandler{
-		configVolumeHandleMeta: createConfigVolumeMeta(name, parametersv1alpha1.TPLScriptType, &tplConfig.FormatterConfig),
-		tplContent:             string(tplContent),
-		tplScripts:             tplScripts,
-		engineType:             tplConfig.DataType,
-		dsn:                    dsn,
-		backupPath:             backupPath,
+		tplContent:      string(tplContent),
+		tplScripts:      tplScripts,
+		engineType:      tplConfig.DataType,
+		dsn:             dsn,
+		backupPath:      backupPath,
+		formatterConfig: &tplConfig.FormatterConfig,
 	}
 	return tplHandler, nil
 }
diff --git a/pkg/parameters/configmanager/config_handler_test.go b/pkg/parameters/configmanager/config_handler_test.go
@@ -135,7 +135,7 @@ var _ = Describe("Config Handler Test", func() {
 			b, _ := util.ToYamlConfig(tplConfig)
 			Expect(os.WriteFile(configFile, b, fs.ModePerm)).Should(Succeed())
 
-			handler, err := createTPLScriptHandler("", configFile, []string{filepath.Join(tmpWorkDir, "config")}, "")
+			handler, err := createTPLScriptHandler(configFile, []string{filepath.Join(tmpWorkDir, "config")}, "")
 			Expect(err).Should(Succeed())
 			tplHandler := handler.(*tplScriptHandler)
 			Expect(tplHandler.dsn).Should(BeEquivalentTo("admin:admin@(localhost:3306)/"))
diff --git a/pkg/parameters/core/config_util.go b/pkg/parameters/core/config_util.go
@@ -22,10 +22,7 @@ package core
 import (
 	"context"
 	"path/filepath"
-	"regexp"
-	"strings"
 
-	"github.com/spf13/cast"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
@@ -37,25 +34,6 @@ type ParamPairs struct {
 	UpdatedParams map[string]interface{}
 }
 
-const pattern = `^[a-z0-9A-Z]([a-zA-Z0-9\.\-\_]*[a-zA-Z0-9])?$`
-const validLabelLength = 63
-
-var regxPattern = regexp.MustCompile(pattern)
-
-func FromValueToString(val interface{}) string {
-	str := strings.Trim(cast.ToString(val), ` '"`)
-	if IsValidLabelKeyOrValue(str) {
-		return str
-	}
-	return ""
-}
-
-// IsValidLabelKeyOrValue checks if the input string is a valid label key or value
-// https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set
-func IsValidLabelKeyOrValue(label string) bool {
-	return len(label) <= validLabelLength && regxPattern.MatchString(label)
-}
-
 // MergeUpdatedConfig replaces the file content of the changed key.
 // baseMap is the original configuration file,
 // updatedMap is the updated configuration file
diff --git a/pkg/parameters/core/type.go b/pkg/parameters/core/type.go
@@ -160,12 +160,6 @@ func GenerateComponentConfigurationName(clusterName, componentName string) strin
 	return fmt.Sprintf("%s-%s", clusterName, componentName)
 }
 
-// GenerateTPLUniqLabelKeyWithConfig generates uniq key for configuration template
-// reference: docs/img/reconfigure-cr-relationship.drawio.png
-func GenerateTPLUniqLabelKeyWithConfig(configKey string) string {
-	return GenerateUniqKeyWithConfig(constant.ConfigurationTplLabelPrefixKey, configKey)
-}
-
 // GenerateUniqKeyWithConfig is similar to getInstanceCfgCMName, generates uniq label/annotations for configuration template
 func GenerateUniqKeyWithConfig(label string, configKey string) string {
 	return fmt.Sprintf("%s-%s", label, configKey)
diff --git a/pkg/parameters/core/type_test.go b/pkg/parameters/core/type_test.go
@@ -26,7 +26,6 @@ import (
 )
 
 func TestGetInstanceName(t *testing.T) {
-	require.Equal(t, "config.kubeblocks.io/tpl-template-test", GenerateTPLUniqLabelKeyWithConfig("template-test"))
 	require.Equal(t, "config.kubeblocks.io/constraints-test", GenerateConstraintsUniqLabelKeyWithConfig("test"))
 	require.Equal(t, "mytest-mysql-config-template", GetComponentCfgName("mytest", "mysql", "config-template"))
 	require.Equal(t, "mytest-envfrom", GenerateEnvFromName("mytest"))
diff --git a/pkg/parameters/resource_wrapper.go b/pkg/parameters/resource_wrapper.go
diff --git a/pkg/parameters/utils.go b/pkg/parameters/utils.go

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ import (`
`35`	`35`	`ctrl "sigs.k8s.io/controller-runtime"`
`36`	`36`	`kzap "sigs.k8s.io/controller-runtime/pkg/log/zap"`
`37`	`37`
`38`		`- kbagent "github.com/apecloud/kubeblocks/pkg/kbagent"`
	`38`	`+ "github.com/apecloud/kubeblocks/pkg/kbagent"`
`39`	`39`	`"github.com/apecloud/kubeblocks/pkg/kbagent/server"`
`40`	`40`	`viper "github.com/apecloud/kubeblocks/pkg/viperx"`
`41`	`41`	`)`
Original file line number	Diff line number	Diff line change
`@@ -32,22 +32,20 @@ import (`
`32`	`32`	`intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"`
`33`	`33`	`"github.com/apecloud/kubeblocks/pkg/generics"`
`34`	`34`	`"github.com/apecloud/kubeblocks/pkg/parameters/core"`
`35`		`- cfgutil "github.com/apecloud/kubeblocks/pkg/parameters/util"`
`36`	`35`	`)`
`37`	`36`
`38`		`-func retrieveRelatedComponentsByConfigmap[T generics.Object, PT generics.PObject[T], L generics.ObjList[T], PL generics.PObjList[T, L]](cli client.Client, ctx context.Context, configSpecName string, _ func(T, PT, L, PL), cfg client.ObjectKey, opts ...client.ListOption) ([]T, []string, error) {`
	`37`	`+func retrieveRelatedComponentsByConfigmap[T generics.Object, PT generics.PObject[T], L generics.ObjList[T], PL generics.PObjList[T, L]](cli client.Client, ctx context.Context, _ func(T, PT, L, PL), cfg client.ObjectKey, opts ...client.ListOption) ([]T, error) {`
`39`	`38`	`var objList L`
`40`	`39`	`if err := cli.List(ctx, PL(&objList), opts...); err != nil {`
`41`		`- return nil, nil, err`
	`40`	`+ return nil, err`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`objs := make([]T, 0)`
`45`		`- containers := cfgutil.NewSet()`
`46`	`44`	`items := toObjects[T, L, PL](&objList)`
`47`	`45`	`for i := range items {`
`48`	`46`	`obj := toResourceObject(&items[i])`
`49`	`47`	`if objs == nil {`
`50`		`- return nil, nil, core.MakeError("failed to convert to resource object")`
	`48`	`+ return nil, core.MakeError("failed to convert to resource object")`
`51`	`49`	`}`
`52`	`50`	`podTemplate := transformPodTemplate(obj)`
`53`	`51`	`if podTemplate == nil {`
`@@ -65,10 +63,9 @@ func retrieveRelatedComponentsByConfigmap[T generics.Object, PT generics.PObject`
`65`	`63`	`})`
`66`	`64`	`if len(contains) > 0 {`
`67`	`65`	`objs = append(objs, items[i])`
`68`		`- containers.Add(contains...)`
`69`	`66`	`}`
`70`	`67`	`}`
`71`		`- return objs, containers.AsSlice(), nil`
	`68`	`+ return objs, nil`
`72`	`69`	`}`
`73`	`70`
`74`	`71`	`func transformPodTemplate(obj client.Object) *corev1.PodTemplateSpec {`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func (r *ParameterReconciler) generateParameterTaskContext(`
`174`	`174`	`Namespace: parameter.Namespace,`
`175`	`175`	`ClusterName: parameter.Spec.ClusterName,`
`176`	`176`	`ComponentName: compName,`
`177`		`- }, nil, cluster, "", nil))`
	`177`	`+ }, nil, cluster, nil))`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`return rctxs, params, nil`