chore: bump go version to 1.24

shanshanying · shanshanying · commit a1ba624e18d0 · 2025-11-18T18:07:14.000+08:00
diff --git a/.github/workflows/cicd-pull-request.yml b/.github/workflows/cicd-pull-request.yml
@@ -7,7 +7,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   BASE_BRANCH: origin/main
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.24"
 
 jobs:
   trigger-mode:
@@ -61,7 +61,7 @@ jobs:
 
       - name: Install golangci-lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8
 
       - name: make module
         run: |
diff --git a/.github/workflows/cicd-push.yml b/.github/workflows/cicd-push.yml
@@ -11,7 +11,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   BASE_BRANCH: origin/main
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.24"
 
 jobs:
   trigger-mode:
@@ -136,7 +136,7 @@ jobs:
 
       - name: Install golangci-lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8
 
       - name: make module
         run: |
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   BASE_BRANCH: origin/main
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.24"
 
 jobs:
   trigger-mode:
diff --git a/.github/workflows/release-kbcli.yml b/.github/workflows/release-kbcli.yml
@@ -9,7 +9,7 @@ env:
   GH_TOKEN: ${{ github.token }}
   GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   TAG_NAME: ${{ github.ref_name }}
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.24"
   CLI_NAME: 'kbcli'
   JIHULAB_KBCLI_PROJECT_ID: 85948
   JIHULAB_ACCESS_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -261,7 +261,7 @@ install-docker-buildx: ## Create `docker buildx` builder.
 	fi
 
 .PHONY: golangci
-golangci: GOLANGCILINT_VERSION = v1.55.2
+golangci: GOLANGCILINT_VERSION = v1.64.8
 golangci: ## Download golangci-lint locally if necessary.
 ifneq ($(shell which golangci-lint),)
 	@echo golangci-lint is already installed
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/action/exec.go b/pkg/action/exec.go
@@ -166,7 +166,7 @@ func (o *ExecOptions) RunWithRedirect(outWriter io.Writer, errWriter io.Writer)
 			TTY:       t.Raw,
 		}, scheme.ParameterCodec)
 
-		return o.Executor.Execute("POST", req.URL(), o.Config, o.In, outWriter, errWriter, t.Raw, sizeQueue)
+		return o.Executor.Execute(req.URL(), o.Config, o.In, outWriter, errWriter, t.Raw, sizeQueue)
 	}
 
 	if err := t.Safe(fn); err != nil {
diff --git a/pkg/cluster/charts/elasticsearch-cluster.tgz b/pkg/cluster/charts/elasticsearch-cluster.tgz
diff --git a/pkg/cluster/charts/kafka-cluster.tgz b/pkg/cluster/charts/kafka-cluster.tgz
diff --git a/pkg/cluster/charts/mongodb-cluster.tgz b/pkg/cluster/charts/mongodb-cluster.tgz
diff --git a/pkg/cluster/charts/postgresql-cluster.tgz b/pkg/cluster/charts/postgresql-cluster.tgz
diff --git a/pkg/cluster/charts/qdrant-cluster.tgz b/pkg/cluster/charts/qdrant-cluster.tgz
diff --git a/pkg/cluster/cluster_chart.go b/pkg/cluster/cluster_chart.go
@@ -223,8 +223,8 @@ func loadHelmChart(ci *ChartInfo, t ClusterType) error {
 
 func SupportedTypes() []ClusterType {
 	types := maps.Keys(ClusterTypeCharts)
-	slices.SortFunc(types, func(i, j ClusterType) bool {
-		return i.String() < j.String()
+	slices.SortFunc(types, func(i, j ClusterType) int {
+		return strings.Compare(i.String(), j.String())
 	})
 	return types
 }
diff --git a/pkg/cmd/cluster/config_edit.go b/pkg/cmd/cluster/config_edit.go
@@ -208,7 +208,7 @@ func (o *editConfigOptions) confirmReconfigure(promptStr string) (bool, error) {
 	const noStr = "no"
 
 	confirmStr := []string{yesStr, noStr}
-	printer.Warning(o.Out, promptStr)
+	printer.Warning(o.Out, "%s", promptStr)
 	input, err := prompt.NewPrompt("Please type [Yes/No] to confirm:",
 		func(input string) error {
 			if !slices.Contains(confirmStr, strings.ToLower(input)) {
diff --git a/pkg/cmd/cluster/config_ops.go b/pkg/cmd/cluster/config_ops.go
@@ -61,7 +61,7 @@ type configOpsOptions struct {
 
 var (
 	createReconfigureExample = templates.Examples(`
-		# update component params 
+		# update component params
 		kbcli cluster configure mycluster --component=mysql --config-spec=mysql-3node-tpl --config-file=my.cnf --set max_connections=1000,general_log=OFF
 
 		# if only one component, and one config spec, and one config file, simplify the searching process of configure. e.g:
@@ -203,7 +203,7 @@ func (o *configOpsOptions) confirmReconfigureWithRestart() error {
 		return nil
 	}
 	const confirmStr = "yes"
-	printer.Warning(o.Out, restartConfirmPrompt)
+	printer.Warning(o.Out, "%s", restartConfirmPrompt)
 	_, err := prompt.NewPrompt(fmt.Sprintf("Please type \"%s\" to confirm:", confirmStr),
 		func(input string) error {
 			if input != confirmStr {
@@ -216,7 +216,7 @@ func (o *configOpsOptions) confirmReconfigureWithRestart() error {
 
 func (o *configOpsOptions) parseUpdatedParams() (map[string]string, error) {
 	if len(o.Parameters) == 0 && len(o.LocalFilePath) == 0 {
-		return nil, core.MakeError(missingUpdatedParametersErrMessage)
+		return nil, core.MakeError("%s", missingUpdatedParametersErrMessage)
 	}
 
 	keyValues := make(map[string]string)
diff --git a/pkg/cmd/cluster/config_wrapper.go b/pkg/cmd/cluster/config_wrapper.go
@@ -120,7 +120,7 @@ func (w *configWrapper) fillComponent() error {
 		return err
 	}
 	if len(componentNames) != 1 {
-		return core.MakeError(multiComponentsErrorMessage)
+		return core.MakeError("%s", multiComponentsErrorMessage)
 	}
 	w.componentName = componentNames[0]
 	return nil
@@ -159,7 +159,7 @@ func (w *configWrapper) fillConfigSpec() error {
 	}
 
 	if len(w.updatedParams) == 0 {
-		return core.MakeError(multiConfigTemplateErrorMessage)
+		return core.MakeError("%s", multiConfigTemplateErrorMessage)
 	}
 	supportUpdatedTpl := make([]appsv1alpha1.ComponentConfigSpec, 0)
 	for _, configSpec := range configSpecs {
@@ -172,7 +172,7 @@ func (w *configWrapper) fillConfigSpec() error {
 		w.configSpecName = supportUpdatedTpl[0].Name
 		return nil
 	}
-	return core.MakeError(multiConfigTemplateErrorMessage)
+	return core.MakeError("%s", multiConfigTemplateErrorMessage)
 }
 
 func (w *configWrapper) fillConfigFile() error {
@@ -201,7 +201,7 @@ func (w *configWrapper) fillConfigFile() error {
 		w.configFileKey = keys[0]
 		return nil
 	}
-	return core.MakeError(multiConfigFileErrorMessage)
+	return core.MakeError("%s", multiConfigFileErrorMessage)
 }
 
 func (w *configWrapper) filterForReconfiguring(data map[string]string) []string {
diff --git a/pkg/cmd/cluster/create.go b/pkg/cmd/cluster/create.go
@@ -1077,7 +1077,7 @@ func buildClusterComp(cd *appsv1alpha1.ClusterDefinition,
 		// get replicas
 		setReplicas, err := strconv.Atoi(getVal(&c, keyReplicas, sets))
 		if err != nil {
-			return nil, fmt.Errorf("repicas is illegal " + err.Error())
+			return nil, fmt.Errorf("repicas is illegal: %w", err)
 		}
 		if setReplicas < 0 {
 			return nil, fmt.Errorf("repicas is illegal, required value >=0")
@@ -1114,7 +1114,7 @@ func buildClusterComp(cd *appsv1alpha1.ClusterDefinition,
 						AccessModes: []corev1.PersistentVolumeAccessMode{
 							corev1.ReadWriteOnce,
 						},
-						Resources: corev1.ResourceRequirements{
+						Resources: corev1.VolumeResourceRequirements{
 							Requests: corev1.ResourceList{
 								corev1.ResourceStorage: resource.MustParse(getVal(&c, keyStorage, sets)),
 							},
@@ -1719,7 +1719,7 @@ func rebuildCompStorage(pvcMaps map[string][]map[storageKey]string, specs []*app
 				AccessModes: []corev1.PersistentVolumeAccessMode{
 					corev1.ReadWriteOnce,
 				},
-				Resources: corev1.ResourceRequirements{
+				Resources: corev1.VolumeResourceRequirements{
 					Requests: corev1.ResourceList{
 						corev1.ResourceStorage: resource.MustParse(viper.GetString(types.CfgKeyClusterDefaultStorageSize)),
 					},
@@ -1740,7 +1740,7 @@ func rebuildCompStorage(pvcMaps map[string][]map[storageKey]string, specs []*app
 			res.Spec.StorageClassName = &storageClass
 		}
 		if storageSize, ok := storageSet[storageKeySize]; ok {
-			res.Spec.Resources = corev1.ResourceRequirements{
+			res.Spec.Resources = corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse(storageSize),
 				},
diff --git a/pkg/cmd/cluster/create_test.go b/pkg/cmd/cluster/create_test.go
@@ -63,6 +63,10 @@ func getResource(res corev1.ResourceRequirements, name corev1.ResourceName) inte
 	return res.Requests[name].ToUnstructured()
 }
 
+func getVolumeResource(res corev1.VolumeResourceRequirements, name corev1.ResourceName) interface{} {
+	return res.Requests[name].ToUnstructured()
+}
+
 var _ = Describe("create", func() {
 	Context("setEnableAllLogs Test", func() {
 		var cluster *appsv1alpha1.Cluster
@@ -124,7 +128,7 @@ var _ = Describe("create", func() {
 		Expect(len(comps)).Should(BeNumerically(">=", compIndex))
 
 		comp := comps[compIndex]
-		Expect(getResource(comp.VolumeClaimTemplates[0].Spec.Resources, corev1.ResourceStorage)).Should(Equal(storage))
+		Expect(getVolumeResource(comp.VolumeClaimTemplates[0].Spec.Resources, corev1.ResourceStorage)).Should(Equal(storage))
 		Expect(comp.Replicas).Should(BeEquivalentTo(replicas))
 
 		resources := comp.Resources
@@ -683,7 +687,7 @@ var _ = Describe("create", func() {
 								AccessModes: []corev1.PersistentVolumeAccessMode{
 									corev1.ReadWriteOnce,
 								},
-								Resources: corev1.ResourceRequirements{
+								Resources: corev1.VolumeResourceRequirements{
 									Requests: corev1.ResourceList{
 										corev1.ResourceStorage: resource.MustParse("10Gi"),
 									},
@@ -696,7 +700,7 @@ var _ = Describe("create", func() {
 								AccessModes: []corev1.PersistentVolumeAccessMode{
 									corev1.ReadWriteOnce,
 								},
-								Resources: corev1.ResourceRequirements{
+								Resources: corev1.VolumeResourceRequirements{
 									Requests: corev1.ResourceList{
 										corev1.ResourceStorage: resource.MustParse("5Gi"),
 									},
@@ -711,7 +715,7 @@ var _ = Describe("create", func() {
 								AccessModes: []corev1.PersistentVolumeAccessMode{
 									corev1.ReadWriteOnce,
 								},
-								Resources: corev1.ResourceRequirements{
+								Resources: corev1.VolumeResourceRequirements{
 									Requests: corev1.ResourceList{
 										corev1.ResourceStorage: resource.MustParse("5Gi"),
 									},
diff --git a/pkg/cmd/cluster/errors.go b/pkg/cmd/cluster/errors.go
@@ -74,5 +74,5 @@ func makeNotSupportConfigFileUpdateErr(configFile string, configSpec appsv1alpha
 }
 
 func makeMissingClusterNameErr() error {
-	return cfgcore.MakeError(missingClusterArgErrMassage)
+	return cfgcore.MakeError("%s", missingClusterArgErrMassage)
 }
diff --git a/pkg/cmd/cluster/operations_test.go b/pkg/cmd/cluster/operations_test.go
@@ -171,7 +171,7 @@ var _ = Describe("operations", func() {
 				AccessModes: []corev1.PersistentVolumeAccessMode{
 					corev1.ReadWriteOnce,
 				},
-				Resources: corev1.ResourceRequirements{
+				Resources: corev1.VolumeResourceRequirements{
 					Requests: corev1.ResourceList{
 						"storage": resource.MustParse("3Gi"),
 					},
diff --git a/pkg/cmd/kubeblocks/uninstall.go b/pkg/cmd/kubeblocks/uninstall.go
@@ -352,7 +352,7 @@ func checkResources(dynamic dynamic.Interface) error {
 		for k, v := range crs {
 			errMsg.WriteString(fmt.Sprintf("  %s: %s\n", k, strings.Join(v, " ")))
 		}
-		return errors.Errorf(errMsg.String())
+		return errors.New(errMsg.String())
 	}
 	return nil
 }
diff --git a/pkg/cmd/playground/destroy.go b/pkg/cmd/playground/destroy.go
@@ -152,7 +152,7 @@ func (o *destroyOptions) destroyCloud() error {
 	// kubeconfig and context, otherwise, it will delete the wrong cluster.
 	if err = o.deleteClustersAndUninstallKB(); err != nil {
 		if strings.Contains(err.Error(), kubeClusterUnreachableErr.Error()) {
-			printer.Warning(o.Out, err.Error())
+			printer.Warning(o.Out, "%s", err.Error())
 		} else {
 			return err
 		}
diff --git a/pkg/cmd/playground/init.go b/pkg/cmd/playground/init.go
@@ -327,7 +327,7 @@ func (o *initOptions) confirmToContinue() error {
 
 func (o *initOptions) confirmInitNewKubeCluster() error {
 	printer.Warning(o.Out, `This action will create a kubernetes cluster on the cloud that may
-  incur charges. Be sure to delete your infrastructure properly to avoid additional charges. 
+  incur charges. Be sure to delete your infrastructure properly to avoid additional charges.
 `)
 
 	fmt.Fprintf(o.Out, `
@@ -487,7 +487,7 @@ func (o *initOptions) installKubeBlocks(k8sClusterName string) error {
 		// if the KubeBlocks has been installed, we ignore the error
 		errMsg := err.Error()
 		if strings.Contains(errMsg, "repeated installation is not supported") {
-			fmt.Fprintf(o.Out, strings.Split(errMsg, ",")[0]+"\n")
+			fmt.Fprintf(o.Out, "%s", strings.Split(errMsg, ",")[0]+"\n")
 			return nil
 		}
 		return err
@@ -545,7 +545,7 @@ func (o *initOptions) checkExistedCluster() error {
 	// if cloud provider is not same with the existed cluster cloud provider, suggest
 	// user to destroy the previous cluster first
 	if o.prevCluster.CloudProvider != o.cloudProvider {
-		printer.Warning(o.Out, warningMsg)
+		printer.Warning(o.Out, "%s", warningMsg)
 		return cmdutil.ErrExit
 	}
 
@@ -557,7 +557,7 @@ func (o *initOptions) checkExistedCluster() error {
 	// is same with the new cluster region, if not, suggest user to destroy the previous
 	// cluster first
 	if o.prevCluster.Region != o.region {
-		printer.Warning(o.Out, warningMsg)
+		printer.Warning(o.Out, "%s", warningMsg)
 		return cmdutil.ErrExit
 	}
 	return nil
diff --git a/pkg/testing/fake.go b/pkg/testing/fake.go
@@ -144,7 +144,7 @@ func FakeCluster(name, namespace string, conditions ...metav1.Condition) *appsv1
 								AccessModes: []corev1.PersistentVolumeAccessMode{
 									corev1.ReadWriteOnce,
 								},
-								Resources: corev1.ResourceRequirements{
+								Resources: corev1.VolumeResourceRequirements{
 									Requests: corev1.ResourceList{
 										corev1.ResourceStorage: resource.MustParse("1Gi"),
 									},
@@ -170,7 +170,7 @@ func FakeCluster(name, namespace string, conditions ...metav1.Condition) *appsv1
 								AccessModes: []corev1.PersistentVolumeAccessMode{
 									corev1.ReadWriteOnce,
 								},
-								Resources: corev1.ResourceRequirements{
+								Resources: corev1.VolumeResourceRequirements{
 									Requests: corev1.ResourceList{
 										corev1.ResourceStorage: resource.MustParse("1Gi"),
 									},
@@ -686,7 +686,7 @@ func FakePVCs() *corev1.PersistentVolumeClaimList {
 		Spec: corev1.PersistentVolumeClaimSpec{
 			StorageClassName: pointer.String(StorageClassName),
 			AccessModes:      []corev1.PersistentVolumeAccessMode{"ReadWriteOnce"},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse("1Gi"),
 				},

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func (o *ExecOptions) RunWithRedirect(outWriter io.Writer, errWriter io.Writer)`
`166`	`166`	`TTY: t.Raw,`
`167`	`167`	`}, scheme.ParameterCodec)`
`168`	`168`
`169`		`- return o.Executor.Execute("POST", req.URL(), o.Config, o.In, outWriter, errWriter, t.Raw, sizeQueue)`
	`169`	`+ return o.Executor.Execute(req.URL(), o.Config, o.In, outWriter, errWriter, t.Raw, sizeQueue)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if err := t.Safe(fn); err != nil {`