Merge branch 'main' into support/hscale-in-its

leon-inf · leon-inf · commit cc9b155afac0 · 2025-09-09T17:30:26.000+08:00
diff --git a/apis/workloads/v1/instance_types.go b/apis/workloads/v1/instance_types.go
@@ -183,7 +183,7 @@ type InstanceStatus2 struct {
 	// +optional
 	Role string `json:"role,omitempty"`
 
-	// Represents if the instance is in volume expansion.
+	// Represents whether the instance is in volume expansion.
 	//
 	// +optional
 	VolumeExpansion bool `json:"volumeExpansion,omitempty"`
diff --git a/apis/workloads/v1/instanceset_types.go b/apis/workloads/v1/instanceset_types.go
@@ -535,7 +535,7 @@ type InstanceStatus struct {
 	// +optional
 	Role string `json:"role,omitempty"`
 
-	// Represents if the instance is in volume expansion.
+	// Represents whether the instance is in volume expansion.
 	//
 	// +optional
 	VolumeExpansion bool `json:"volumeExpansion,omitempty"`
diff --git a/config/crd/bases/workloads.kubeblocks.io_instances.yaml b/config/crd/bases/workloads.kubeblocks.io_instances.yaml
@@ -11263,7 +11263,7 @@ spec:
                   the Instance used to generate pod.
                 type: string
               volumeExpansion:
-                description: Represents if the instance is in volume expansion.
+                description: Represents whether the instance is in volume expansion.
                 type: boolean
             type: object
         type: object
diff --git a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml
@@ -13017,7 +13017,7 @@ spec:
                       description: Represents the role of the instance observed.
                       type: string
                     volumeExpansion:
-                      description: Represents if the instance is in volume expansion.
+                      description: Represents whether the instance is in volume expansion.
                       type: boolean
                   required:
                   - podName
diff --git a/controllers/dataprotection/backuprepo_controller.go b/controllers/dataprotection/backuprepo_controller.go
@@ -776,7 +776,6 @@ func (r *BackupRepoReconciler) runPreCheckJobForMounting(reconCtx *reconcileCont
 						}},
 						SecurityContext: &corev1.SecurityContext{
 							AllowPrivilegeEscalation: boolptr.False(),
-							RunAsNonRoot:             boolptr.True(),
 						},
 					}},
 					Volumes: []corev1.Volume{{
@@ -788,6 +787,9 @@ func (r *BackupRepoReconciler) runPreCheckJobForMounting(reconCtx *reconcileCont
 						},
 					}},
 					ServiceAccountName: saName,
+					SecurityContext: &corev1.PodSecurityContext{
+						RunAsNonRoot: boolptr.True(),
+					},
 				},
 			},
 			BackoffLimit: pointer.Int32(2),
@@ -856,10 +858,12 @@ datasafed rm %s`, precheckFilePath, precheckFilePath, precheckFilePath),
 						},
 						SecurityContext: &corev1.SecurityContext{
 							AllowPrivilegeEscalation: boolptr.False(),
-							RunAsNonRoot:             boolptr.True(),
 						},
 					}},
 					ServiceAccountName: saName,
+					SecurityContext: &corev1.PodSecurityContext{
+						RunAsNonRoot: boolptr.True(),
+					},
 				},
 			},
 			BackoffLimit: pointer.Int32(2),
diff --git a/deploy/helm/crds/workloads.kubeblocks.io_instances.yaml b/deploy/helm/crds/workloads.kubeblocks.io_instances.yaml
@@ -11263,7 +11263,7 @@ spec:
                   the Instance used to generate pod.
                 type: string
               volumeExpansion:
-                description: Represents if the instance is in volume expansion.
+                description: Represents whether the instance is in volume expansion.
                 type: boolean
             type: object
         type: object
diff --git a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml
@@ -13017,7 +13017,7 @@ spec:
                       description: Represents the role of the instance observed.
                       type: string
                     volumeExpansion:
-                      description: Represents if the instance is in volume expansion.
+                      description: Represents whether the instance is in volume expansion.
                       type: boolean
                   required:
                   - podName
diff --git a/docs/developer_docs/api-reference/cluster.md b/docs/developer_docs/api-reference/cluster.md
@@ -33330,7 +33330,7 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>Represents if the instance is in volume expansion.</p>
+<p>Represents whether the instance is in volume expansion.</p>
 </td>
 </tr>
 <tr>
@@ -33474,7 +33474,7 @@ bool
 </td>
 <td>
 <em>(Optional)</em>
-<p>Represents if the instance is in volume expansion.</p>
+<p>Represents whether the instance is in volume expansion.</p>
 </td>
 </tr>
 </tbody>
diff --git a/pkg/controller/component/workload_utils.go b/pkg/controller/component/workload_utils.go
@@ -35,7 +35,7 @@ import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
 	"github.com/apecloud/kubeblocks/pkg/controller/instanceset"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/generics"
 )
 
diff --git a/pkg/controller/instanceset/in_place_update_util.go b/pkg/controller/instanceset/in_place_update_util.go
@@ -30,7 +30,7 @@ import (
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 	viper "github.com/apecloud/kubeblocks/pkg/viperx"
 )
diff --git a/pkg/controller/instanceset/instance_util.go b/pkg/controller/instanceset/instance_util.go
@@ -42,7 +42,7 @@ import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
 	"github.com/apecloud/kubeblocks/pkg/controller/builder"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 )
diff --git a/pkg/controller/instanceset/instance_util_test.go b/pkg/controller/instanceset/instance_util_test.go
@@ -35,7 +35,7 @@ import (
 	kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
 	"github.com/apecloud/kubeblocks/pkg/controller/builder"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 )
 
 var _ = Describe("instance util test", func() {
diff --git a/pkg/controller/instanceset/reconciler_instance_alignment.go b/pkg/controller/instanceset/reconciler_instance_alignment.go
@@ -27,7 +27,7 @@ import (
 	kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
diff --git a/pkg/controller/instanceset/reconciler_revision_update.go b/pkg/controller/instanceset/reconciler_revision_update.go
@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 )
diff --git a/pkg/controller/instanceset/reconciler_status.go b/pkg/controller/instanceset/reconciler_status.go
@@ -34,7 +34,7 @@ import (
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
@@ -298,25 +298,24 @@ func buildFailureCondition(its *workloads.InstanceSet, pods []*corev1.Pod) (*met
 }
 
 func setInstanceStatus(tree *kubebuilderx.ObjectTree, its *workloads.InstanceSet, pods []*corev1.Pod) {
-	// compose new instance status
-	newInstanceStatus := make([]workloads.InstanceStatus, 0)
+	instanceStatus := make([]workloads.InstanceStatus, 0)
 	for _, pod := range pods {
-		instanceStatus := workloads.InstanceStatus{
+		status := workloads.InstanceStatus{
 			PodName: pod.Name,
 		}
-		newInstanceStatus = append(newInstanceStatus, instanceStatus)
+		instanceStatus = append(instanceStatus, status)
 	}
 
-	syncMemberStatus(its, newInstanceStatus, pods)
+	syncMemberStatus(its, instanceStatus, pods)
 
-	syncInstanceConfigStatus(its, newInstanceStatus)
+	syncInstanceConfigStatus(its, instanceStatus)
 
 	if tree != nil {
-		syncInstancePVCStatus(tree, its, newInstanceStatus)
+		syncInstancePVCStatus(tree, its, instanceStatus)
 	}
 
-	sortInstanceStatus(newInstanceStatus)
-	its.Status.InstanceStatus = newInstanceStatus
+	sortInstanceStatus(instanceStatus)
+	its.Status.InstanceStatus = instanceStatus
 }
 
 func sortInstanceStatus(instanceStatus []workloads.InstanceStatus) {
diff --git a/pkg/controller/instanceset/reconciler_update.go b/pkg/controller/instanceset/reconciler_update.go
@@ -34,7 +34,7 @@ import (
 	kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/lifecycle"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
diff --git a/pkg/controller/instanceset/reconciler_validation.go b/pkg/controller/instanceset/reconciler_validation.go
@@ -21,7 +21,7 @@ package instanceset
 
 import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 )
 
diff --git a/pkg/controller/instanceset2/instance_util.go b/pkg/controller/instanceset2/instance_util.go
@@ -36,7 +36,7 @@ import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/constant"
 	"github.com/apecloud/kubeblocks/pkg/controller/builder"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
diff --git a/pkg/controller/instanceset2/reconciler_alignment.go b/pkg/controller/instanceset2/reconciler_alignment.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
diff --git a/pkg/controller/instanceset2/reconciler_status.go b/pkg/controller/instanceset2/reconciler_status.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
diff --git a/pkg/controller/instanceset2/reconciler_update.go b/pkg/controller/instanceset2/reconciler_update.go
@@ -27,7 +27,7 @@ import (
 
 	kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
diff --git a/pkg/controller/instanceset2/reconciler_validation.go b/pkg/controller/instanceset2/reconciler_validation.go
@@ -21,7 +21,7 @@ package instanceset2
 
 import (
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
-	"github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"
+	"github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
 )
 
diff --git a/pkg/controller/instancetemplate/compression.go b/pkg/controller/instancetemplate/compression.go
@@ -22,13 +22,13 @@ package instancetemplate
 import (
 	"encoding/json"
 
+	"github.com/klauspost/compress/zstd"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/runtime"
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
 	"github.com/apecloud/kubeblocks/pkg/controller/builder"
 	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
-	"github.com/klauspost/compress/zstd"
 )
 
 var (
diff --git a/pkg/controller/instancetemplate/name_builder.go b/pkg/controller/instancetemplate/name_builder.go
diff --git a/pkg/controller/instancetemplate/name_builder_default.go b/pkg/controller/instancetemplate/name_builder_default.go
diff --git a/pkg/controller/instancetemplate/name_builder_default_test.go b/pkg/controller/instancetemplate/name_builder_default_test.go
diff --git a/pkg/controller/instancetemplate/name_builder_flat.go b/pkg/controller/instancetemplate/name_builder_flat.go
diff --git a/pkg/controller/instancetemplate/name_builder_flat_test.go b/pkg/controller/instancetemplate/name_builder_flat_test.go
diff --git a/pkg/controller/instancetemplate/ordinal.go b/pkg/controller/instancetemplate/ordinal.go
diff --git a/pkg/controller/instancetemplate/suite_test.go b/pkg/controller/instancetemplate/suite_test.go
@@ -24,6 +24,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/controller/instancetemplate/template.go b/pkg/controller/instancetemplate/template.go
diff --git a/pkg/controller/instancetemplate/types.go b/pkg/controller/instancetemplate/types.go
diff --git a/pkg/controller/instancetemplate/validation.go b/pkg/controller/instancetemplate/validation.go
diff --git a/pkg/controller/instancetemplate/validation_test.go b/pkg/controller/instancetemplate/validation_test.go
@@ -18,6 +18,7 @@ package instancetemplate
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"k8s.io/utils/ptr"
 
 	kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
diff --git a/pkg/dataprotection/utils/backuprepo.go b/pkg/dataprotection/utils/backuprepo.go
@@ -155,7 +155,6 @@ func injectDatasafedInstaller(podSpec *corev1.PodSpec) {
 		VolumeMounts:    []corev1.VolumeMount{sharedVolumeMount},
 		SecurityContext: &corev1.SecurityContext{
 			AllowPrivilegeEscalation: boolptr.False(),
-			RunAsNonRoot:             boolptr.True(),
 		},
 	}
 	intctrlutil.InjectZeroResourcesLimitsIfEmpty(&initContainer)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ import (`
`35`	`35`	`workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"`
`36`	`36`	`"github.com/apecloud/kubeblocks/pkg/constant"`
`37`	`37`	`"github.com/apecloud/kubeblocks/pkg/controller/instanceset"`
`38`		`- "github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"`
	`38`	`+ "github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"`
`39`	`39`	`"github.com/apecloud/kubeblocks/pkg/generics"`
`40`	`40`	`)`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`
`31`	`31`	`workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"`
`32`	`32`	`"github.com/apecloud/kubeblocks/pkg/constant"`
`33`		`- "github.com/apecloud/kubeblocks/pkg/controller/instanceset/instancetemplate"`
	`33`	`+ "github.com/apecloud/kubeblocks/pkg/controller/instancetemplate"`
`34`	`34`	`intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"`
`35`	`35`	`viper "github.com/apecloud/kubeblocks/pkg/viperx"`
`36`	`36`	`)`