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

Author: leon-inf

apis/workloads/v1/instance_types.go

@@ -197,40 +197,3 @@ type InstanceAssistantObject struct {
 	Role           *rbacv1.Role           `json:"role,omitempty"`
 	RoleBinding    *rbacv1.RoleBinding    `json:"roleBinding,omitempty"`
 }
-
-type LifecycleActions struct {
-	// Provides variables which are used to call Actions.
-	//
-	// +optional
-	TemplateVars map[string]string `json:"templateVars,omitempty"`
-
-	// Defines the procedure for a controlled transition of a role to a new replica.
-	//
-	// +optional
-	Switchover *kbappsv1.Action `json:"switchover,omitempty"`
-
-	// Defines the procedure to add a new replica.
-	//
-	// +optional
-	MemberJoin *kbappsv1.Action `json:"memberJoin,omitempty"`
-
-	// Defines the procedure to remove a replica.
-	//
-	// +optional
-	MemberLeave *kbappsv1.Action `json:"memberLeave,omitempty"`
-
-	// Defines the procedure for exporting the data from a replica.
-	//
-	// +optional
-	DataDump *kbappsv1.Action `json:"dataDump,omitempty"`
-
-	// Defines the procedure for importing data into a replica.
-	//
-	// +optional
-	DataLoad *kbappsv1.Action `json:"dataLoad,omitempty"`
-
-	// Defines the procedure that update a replica with new configuration.
-	//
-	// +optional
-	Reconfigure *kbappsv1.Action `json:"reconfigure,omitempty"`
-}

apis/workloads/v1/instanceset_types.go

@@ -487,13 +487,47 @@ const (
 // +kubebuilder:object:generate=false
 type ReplicaRole = kbappsv1.ReplicaRole
 
-type MembershipReconfiguration struct {
+// Action defines a customizable hook or procedure tailored for different database engines,
+// designed to be invoked at predetermined points within the lifecycle of a Component instance.
+//
+// +kubebuilder:object:generate=false
+type Action = kbappsv1.Action
+
+type LifecycleActions struct {
+	// Provides variables which are used to call Actions.
+	//
+	// +optional
+	TemplateVars map[string]string `json:"templateVars,omitempty"`
+
 	// Defines the procedure for a controlled transition of a role to a new replica.
 	//
 	// +optional
-	Switchover *kbappsv1.Action `json:"switchover,omitempty"`
+	Switchover *Action `json:"switchover,omitempty"`
+
+	// Defines the procedure to add a new replica.
+	//
+	// +optional
+	MemberJoin *Action `json:"memberJoin,omitempty"`
+
+	// Defines the procedure to remove a replica.
+	//
+	// +optional
+	MemberLeave *Action `json:"memberLeave,omitempty"`
+
+	// Defines the procedure for exporting the data from a replica.
+	//
+	// +optional
+	DataDump *Action `json:"dataDump,omitempty"`
 
-	// TODO: member join/leave
+	// Defines the procedure for importing data into a replica.
+	//
+	// +optional
+	DataLoad *Action `json:"dataLoad,omitempty"`
+
+	// Defines the procedure that update a replica with new configuration.
+	//
+	// +optional
+	Reconfigure *Action `json:"reconfigure,omitempty"`
 }
 
 type ConfigTemplate struct {

apis/workloads/v1/zz_generated.deepcopy.go

@@ -196,7 +196,6 @@ func (t *componentWorkloadTransformer) handleUpdate(transCtx *componentTransform
 			},
 		})
 	}
-
 	return nil
 }