update

Author: leon-inf

controllers/k8score/event_controller.go

@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/apecloud/kubeblocks/pkg/controller/component"
+	"github.com/apecloud/kubeblocks/pkg/controller/instance"
 	"github.com/apecloud/kubeblocks/pkg/controller/instanceset"
 	"github.com/apecloud/kubeblocks/pkg/controller/multicluster"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
@@ -80,6 +81,7 @@ func (r *EventReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 	}
 
 	handlers := []eventHandler{
+		&instance.PodRoleEventHandler{},
 		&instanceset.PodRoleEventHandler{},
 		&component.AvailableEventHandler{},
 		&component.KBAgentTaskEventHandler{},

controllers/workloads/instance_controller.go

@@ -84,6 +84,7 @@ func (r *InstanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		Do(instance.NewFixMetaReconciler()).
 		Do(instance.NewDeletionReconciler()).
 		Do(instance.NewStatusReconciler()).
+		Do(instance.NewRevisionUpdateReconciler()).
 		Do(instance.NewAssistantObjectReconciler()).
 		Do(instance.NewAlignmentReconciler()).
 		Do(instance.NewUpdateReconciler()).

pkg/constant/annotations.go

@@ -73,5 +73,7 @@ func InheritedAnnotations() []string {
 		HostNetworkAnnotationKey,
 		FeatureReconciliationInCompactModeAnnotationKey,
 		KBAppMultiClusterPlacementKey,
+		"enable-instance-api",
+		"clone-assistant-objects",
 	}
 }

pkg/controller/builder/builder_instance.go

@@ -42,13 +42,13 @@ func (builder *InstanceBuilder) SetFinalizers() *InstanceBuilder {
 	return builder
 }
 
-func (builder *InstanceBuilder) podSpec() *corev1.PodSpec {
-	return &builder.get().Spec.Template.Spec
+func (builder *InstanceBuilder) SetPodTemplate(template corev1.PodTemplateSpec) *InstanceBuilder {
+	builder.get().Spec.Template = template
+	return builder
 }
 
-func (builder *InstanceBuilder) SetPodSpec(podSpec corev1.PodSpec) *InstanceBuilder {
-	*builder.podSpec() = podSpec
-	return builder
+func (builder *InstanceBuilder) podSpec() *corev1.PodSpec {
+	return &builder.get().Spec.Template.Spec
 }
 
 func (builder *InstanceBuilder) SetContainers(containers []corev1.Container) *InstanceBuilder {
@@ -141,6 +141,20 @@ func (builder *InstanceBuilder) SetSelector(selector *metav1.LabelSelector) *Ins
 	return builder
 }
 
+func (builder *InstanceBuilder) SetSelectorMatchLabels(labels map[string]string) *InstanceBuilder {
+	selector := builder.get().Spec.Selector
+	if selector == nil {
+		selector = &metav1.LabelSelector{}
+		builder.get().Spec.Selector = selector
+	}
+	matchLabels := make(map[string]string, len(labels))
+	for k, v := range labels {
+		matchLabels[k] = v
+	}
+	builder.get().Spec.Selector.MatchLabels = matchLabels
+	return builder
+}
+
 func (builder *InstanceBuilder) SetMinReadySeconds(seconds int32) *InstanceBuilder {
 	builder.get().Spec.MinReadySeconds = seconds
 	return builder

pkg/controller/builder/builder_instance_set.go

@@ -165,6 +165,11 @@ func (builder *InstanceSetBuilder) SetDisableDefaultHeadlessService(disable bool
 	return builder
 }
 
+func (builder *InstanceSetBuilder) SetEnableInstanceAPI(enableInstanceAPI *bool) *InstanceSetBuilder {
+	builder.get().Spec.EnableInstanceAPI = enableInstanceAPI
+	return builder
+}
+
 func (builder *InstanceSetBuilder) SetAssistantObjects(objs []corev1.ObjectReference) *InstanceSetBuilder {
 	builder.get().Spec.AssistantObjects = objs
 	return builder

pkg/controller/factory/builder.go

@@ -86,6 +86,16 @@ func BuildInstanceSet(synthesizedComp *component.SynthesizedComponent, compDef *
 		SetTemplateVars(synthesizedComp.TemplateVars).
 		SetAssistantObjects(synthesizedComp.AssistantObjects).
 		SetCloneAssistantObjects(synthesizedComp.CloneAssistantObjects)
+	if synthesizedComp.Annotations != nil {
+		enable, ok1 := synthesizedComp.Annotations["enable-instance-api"]
+		if ok1 && enable == "true" {
+			itsBuilder.SetEnableInstanceAPI(ptr.To(true))
+		}
+		clone, ok2 := synthesizedComp.Annotations["clone-assistant-objects"]
+		if ok2 && clone == "true" {
+			itsBuilder.SetCloneAssistantObjects(true)
+		}
+	}
 	if compDef != nil {
 		itsBuilder.SetDisableDefaultHeadlessService(compDef.Spec.DisableDefaultHeadlessService)
 	}

pkg/controller/instance/in_place_update_utils.go

@@ -285,6 +285,9 @@ func equalResourcesInPlaceFields(old, new *corev1.Pod) bool {
 
 func getPodUpdatePolicy(inst *workloads.Instance, pod *corev1.Pod) (PodUpdatePolicy, error) {
 	if getPodRevision(pod) != inst.Status.UpdateRevision {
+		if len(inst.Status.UpdateRevision) == 0 {
+			return NoOpsPolicy, nil
+		}
 		return RecreatePolicy, nil
 	}
 

pkg/controller/instanceset2/pod_role_event_handler.go renamed to pkg/controller/instance/pod_role_event_handler.go

@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package instanceset2
+package instance
 
 import (
 	"encoding/json"
@@ -173,17 +173,17 @@ func handleRoleChangedEvent(cli client.Client, reqCtx intctrlutil.RequestCtx, _
 
 		var name string
 		if pod.Labels != nil {
-			if n, ok := pod.Labels[WorkloadsInstanceLabelKey]; ok {
+			if n, ok := pod.Labels[constant.KBAppInstanceNameLabelKey]; ok {
 				name = n
 			}
 		}
-		its := &workloads.InstanceSet{}
-		if err := cli.Get(reqCtx.Ctx, types.NamespacedName{Namespace: pod.Namespace, Name: name}, its); err != nil {
+		inst := &workloads.Instance{}
+		if err := cli.Get(reqCtx.Ctx, types.NamespacedName{Namespace: pod.Namespace, Name: name}, inst); err != nil {
 			return "", err
 		}
 		reqCtx.Log.Info("handle role change event", "pod", pod.Name, "role", role, "originalRole", message.OriginalRole)
 
-		if err := updatePodRoleLabel(cli, reqCtx, *its, pod, pair.RoleName, snapshot.Version); err != nil {
+		if err := updatePodRoleLabel(cli, reqCtx, inst, pod, pair.RoleName, snapshot.Version); err != nil {
 			return "", err
 		}
 	}
@@ -239,9 +239,9 @@ func parseProbeEventMessage(reqCtx intctrlutil.RequestCtx, event *corev1.Event)
 
 // updatePodRoleLabel updates pod role label when internal container role changed
 func updatePodRoleLabel(cli client.Client, reqCtx intctrlutil.RequestCtx,
-	its workloads.InstanceSet, pod *corev1.Pod, roleName string, version string) error {
+	inst *workloads.Instance, pod *corev1.Pod, roleName string, version string) error {
 	ctx := reqCtx.Ctx
-	roleMap := composeRoleMap(its)
+	roleMap := composeRoleMap(inst)
 	// role not defined in CR, ignore it
 	roleName = strings.ToLower(roleName)
 
@@ -250,9 +250,9 @@ func updatePodRoleLabel(cli client.Client, reqCtx intctrlutil.RequestCtx,
 	role, ok := roleMap[roleName]
 	switch ok {
 	case true:
-		newPod.Labels[RoleLabelKey] = role.Name
+		newPod.Labels[constant.RoleLabelKey] = role.Name
 	case false:
-		delete(newPod.Labels, RoleLabelKey)
+		delete(newPod.Labels, constant.RoleLabelKey)
 	}
 
 	if newPod.Annotations == nil {

pkg/controller/instance/reconciler_revision_update.go

@@ -0,0 +1,56 @@
+/*
+Copyright (C) 2022-2025 ApeCloud Co., Ltd
+
+This file is part of KubeBlocks project
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package instance
+
+import (
+	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
+	"github.com/apecloud/kubeblocks/pkg/controller/kubebuilderx"
+	"github.com/apecloud/kubeblocks/pkg/controller/model"
+)
+
+func NewRevisionUpdateReconciler() kubebuilderx.Reconciler {
+	return &revisionUpdateReconciler{}
+}
+
+type revisionUpdateReconciler struct{}
+
+var _ kubebuilderx.Reconciler = &revisionUpdateReconciler{}
+
+func (r *revisionUpdateReconciler) PreCondition(tree *kubebuilderx.ObjectTree) *kubebuilderx.CheckResult {
+	if tree.GetRoot() == nil || !model.IsObjectUpdating(tree.GetRoot()) {
+		return kubebuilderx.ConditionUnsatisfied
+	}
+	return kubebuilderx.ConditionSatisfied
+}
+
+func (r *revisionUpdateReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilderx.Result, error) {
+	inst := tree.GetRoot().(*workloads.Instance)
+	revision, err := buildInstancePodRevision(&inst.Spec.Template, inst)
+	if err != nil {
+		return kubebuilderx.Continue, err
+	}
+	inst.Status.UpdateRevision = revision
+	// The 'ObservedGeneration' field is used to indicate whether the revisions have been updated.
+	// Computing these revisions in each reconciliation loop can be time-consuming, so we optimize it by
+	// performing the computation only when the 'spec' is updated.
+	inst.Status.ObservedGeneration = inst.Generation
+
+	return kubebuilderx.Continue, nil
+}

pkg/controller/instance/revision_utils.go

@@ -36,6 +36,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 
 	workloads "github.com/apecloud/kubeblocks/apis/workloads/v1"
+	"github.com/apecloud/kubeblocks/pkg/controller/builder"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 )
 
@@ -46,15 +47,15 @@ var Codecs = serializer.NewCodecFactory(model.GetScheme())
 var patchCodec = Codecs.LegacyCodec(workloads.SchemeGroupVersion)
 var controllerKind = appsv1.SchemeGroupVersion.WithKind("StatefulSet")
 
-func NewRevision(its *workloads.InstanceSet) (*appsv1.ControllerRevision, error) {
-	patch, err := getPatch(its)
+func NewRevision(inst *workloads.Instance) (*appsv1.ControllerRevision, error) {
+	patch, err := getPatch(inst)
 	if err != nil {
 		return nil, err
 	}
 	collision := int32(0)
-	cr, err := NewControllerRevision(its,
+	cr, err := NewControllerRevision(inst,
 		controllerKind,
-		its.Spec.Template.Labels,
+		inst.Spec.Template.Labels,
 		runtime.RawExtension{Raw: patch},
 		1,
 		&collision)
@@ -64,7 +65,7 @@ func NewRevision(its *workloads.InstanceSet) (*appsv1.ControllerRevision, error)
 	if cr.ObjectMeta.Annotations == nil {
 		cr.ObjectMeta.Annotations = make(map[string]string)
 	}
-	for key, value := range its.Annotations {
+	for key, value := range inst.Annotations {
 		cr.ObjectMeta.Annotations[key] = value
 	}
 	return cr, nil
@@ -74,8 +75,8 @@ func NewRevision(its *workloads.InstanceSet) (*appsv1.ControllerRevision, error)
 // previous version. If the returned error is nil the patch is valid. The current state that we save is just the
 // PodSpecTemplate. We can modify this later to encompass more state (or less) and remain compatible with previously
 // recorded patches.
-func getPatch(its *workloads.InstanceSet) ([]byte, error) {
-	data, err := runtime.Encode(patchCodec, its)
+func getPatch(inst *workloads.Instance) ([]byte, error) {
+	data, err := runtime.Encode(patchCodec, inst)
 	if err != nil {
 		return nil, err
 	}
@@ -166,3 +167,19 @@ func getPodRevision(pod *corev1.Pod) string {
 	}
 	return pod.Labels[appsv1.ControllerRevisionHashLabelKey]
 }
+
+func buildInstancePodRevision(template *corev1.PodTemplateSpec, parent *workloads.Instance) (string, error) {
+	podTemplate := filterInPlaceFields(template)
+	inst := builder.NewInstanceBuilder(parent.Namespace, parent.Name).
+		SetUID(parent.UID).
+		AddAnnotationsInMap(parent.Annotations).
+		SetSelectorMatchLabels(parent.Labels).
+		SetPodTemplate(*podTemplate).
+		GetObject()
+
+	cr, err := NewRevision(inst)
+	if err != nil {
+		return "", err
+	}
+	return cr.Labels[ControllerRevisionHashLabel], nil
+}