feat: kb-0.7 support reconfigure operation for multi component (#5906)

apis/apps/v1alpha1/opsrequest_conditions.go

@@ -274,7 +274,7 @@ func NewReconfigureCondition(ops *OpsRequest) *metav1.Condition {
 		LastTransitionTime: metav1.Now(),
 		Message: fmt.Sprintf("Start to reconfigure in Cluster: %s, Component: %s",
 			ops.Spec.ClusterRef,
-			ops.Spec.Reconfigure.ComponentName),
+			getComponentName(ops.Spec)),
 	}
 }
 
@@ -300,7 +300,7 @@ func NewReconfigureRunningCondition(ops *OpsRequest, conditionType string, confi
 	}
 	message := fmt.Sprintf("Reconfiguring in Cluster: %s, Component: %s, ConfigSpec: %s",
 		ops.Spec.ClusterRef,
-		ops.Spec.Reconfigure.ComponentName,
+		getComponentName(ops.Spec),
 		configSpecName)
 	if len(info) > 0 {
 		message = message + ", info: " + info[0]
@@ -314,6 +314,13 @@ func NewReconfigureRunningCondition(ops *OpsRequest, conditionType string, confi
 	}
 }
 
+func getComponentName(request OpsRequestSpec) string {
+	if request.Reconfigure != nil {
+		return request.Reconfigure.ComponentName
+	}
+	return ""
+}
+
 // NewReconfigureFailedCondition creates a condition for the failed reconfigure.
 func NewReconfigureFailedCondition(ops *OpsRequest, err error) *metav1.Condition {
 	var msg string

apis/apps/v1alpha1/opsrequest_types.go

@@ -102,12 +102,22 @@ type OpsRequestSpec struct {
 	// +listMapKey=componentName
 	VerticalScalingList []VerticalScaling `json:"verticalScaling,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"componentName"`
 
+	// Deprecate: replace by reconfigures.
+
 	// reconfigure defines the variables that need to input when updating configuration.
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="forbidden to update spec.reconfigure"
 	// +kubebuilder:validation:XValidation:rule="self.configurations.size() > 0", message="Value can not be empty"
 	Reconfigure *Reconfigure `json:"reconfigure,omitempty"`
 
+	// reconfigure defines the variables that need to input when updating configuration.
+	// +optional
+	// +patchMergeKey=componentName
+	// +patchStrategy=merge,retainKeys
+	// +listType=map
+	// +listMapKey=componentName
+	Reconfigures []Reconfigure `json:"reconfigures,omitempty"`
+
 	// expose defines services the component needs to expose.
 	// +optional
 	// +patchMergeKey=componentName
@@ -469,10 +479,16 @@ type OpsRequestStatus struct {
 	// +optional
 	CancelTimestamp metav1.Time `json:"cancelTimestamp,omitempty"`
 
+	// Deprecate: replace by ReconfiguringStatusAsComponent.
+
 	// reconfiguringStatus defines the status information of reconfiguring.
 	// +optional
 	ReconfiguringStatus *ReconfiguringStatus `json:"reconfiguringStatus,omitempty"`
 
+	// reconfiguringStatus defines the status information of reconfiguring.
+	// +optional
+	ReconfiguringStatusAsComponent map[string]*ReconfiguringStatus `json:"reconfiguringStatusAsComponent,omitempty"`
+
 	// conditions describes opsRequest detail status.
 	// +optional
 	// +patchMergeKey=type
@@ -576,9 +592,16 @@ type OpsRequestComponentStatus struct {
 }
 
 type ReconfiguringStatus struct {
+	// conditions describes reconfiguring detail status.
+	// +optional
+	// +patchMergeKey=type
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
 	// configurationStatus describes the status of the component reconfiguring.
 	// +kubebuilder:validation:Required
-	// +kubebuilder:validation:MinItems=1
 	// +patchMergeKey=name
 	// +patchStrategy=merge,retainKeys
 	// +listType=map

apis/apps/v1alpha1/opsrequest_webhook.go

@@ -287,9 +287,21 @@ func (r *OpsRequest) validateReconfigure(cluster *Cluster) error {
 		return nil
 	}
 	reconfigure := r.Spec.Reconfigure
-	if reconfigure == nil {
+	if reconfigure == nil && len(r.Spec.Reconfigures) == 0 {
 		return notEmptyError("spec.reconfigure")
 	}
+	if reconfigure != nil {
+		return r.validateReconfigureParams(cluster, reconfigure)
+	}
+	for _, reconfigure := range r.Spec.Reconfigures {
+		if err := r.validateReconfigureParams(cluster, &reconfigure); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *OpsRequest) validateReconfigureParams(cluster *Cluster, reconfigure *Reconfigure) error {
 	if cluster.Spec.GetComponentByName(reconfigure.ComponentName) == nil {
 		return fmt.Errorf("component %s not found", reconfigure.ComponentName)
 	}