fix

Author: leon-inf

apis/workloads/v1/instance_types.go

@@ -189,6 +189,6 @@ type InstanceAssistantObject struct {
 	ConfigMap      *corev1.ConfigMap      `json:"configMap,omitempty"`
 	Secret         *corev1.Secret         `json:"secret,omitempty"`
 	ServiceAccount *corev1.ServiceAccount `json:"serviceAccount,omitempty"`
-	Role           *rbacv1.Role           `json:"clusterRole,omitempty"`
+	Role           *rbacv1.Role           `json:"role,omitempty"`
 	RoleBinding    *rbacv1.RoleBinding    `json:"roleBinding,omitempty"`
 }

config/crd/bases/workloads.kubeblocks.io_instances.yaml

@@ -32276,7 +32276,7 @@ Kubernetes core/v1.ServiceAccount
 </tr>
 <tr>
 <td>
-<code>clusterRole</code><br/>
+<code>role</code><br/>
 <em>
 <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#role-v1-rbac">
 Kubernetes rbac/v1.Role

deploy/helm/crds/workloads.kubeblocks.io_instances.yaml

@@ -22,7 +22,6 @@ package instance
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -57,7 +56,7 @@ func (h *PodRoleEventHandler) Handle(cli client.Client, reqCtx intctrlutil.Reque
 		return err
 	}
 
-	// event order is crucial in role probing, but it's not guaranteed when controller restarted, so we have to mark them to be filtered
+	// event order is crucial in role probing, but it's not guaranteed when controller restarted, so we have to mark them to be handled
 	patch := client.MergeFrom(event.DeepCopy())
 	if event.Annotations == nil {
 		event.Annotations = make(map[string]string)
@@ -97,15 +96,6 @@ func (h *PodRoleEventHandler) handleRoleChangedEvent(cli client.Client, reqCtx i
 		return nil
 	}
 
-	snapshotVersion := strconv.FormatInt(event.EventTime.UnixMicro(), 10)
-	lastSnapshotVersion, ok := pod.Annotations[constant.LastRoleSnapshotVersionAnnotationKey]
-	if ok {
-		if snapshotVersion <= lastSnapshotVersion && !strings.Contains(lastSnapshotVersion, ":") {
-			reqCtx.Log.Info("stale role probe event received, ignore it")
-			return nil
-		}
-	}
-
 	var instName string
 	if pod.Labels != nil {
 		if n, ok := pod.Labels[constant.KBAppInstanceNameLabelKey]; ok {
@@ -119,11 +109,11 @@ func (h *PodRoleEventHandler) handleRoleChangedEvent(cli client.Client, reqCtx i
 
 	role := strings.ToLower(string(probeEvent.Output))
 	reqCtx.Log.Info("handle role change event", "pod", pod.Name, "role", role)
-	return h.updatePodRoleLabel(cli, reqCtx, inst, pod, role, snapshotVersion)
+	return h.updatePodRoleLabel(cli, reqCtx, inst, pod, role)
 }
 
 func (h *PodRoleEventHandler) updatePodRoleLabel(cli client.Client, reqCtx intctrlutil.RequestCtx,
-	inst *workloads.Instance, pod *corev1.Pod, roleName string, snapshotVersion string) error {
+	inst *workloads.Instance, pod *corev1.Pod, roleName string) error {
 	var (
 		newPod  = pod.DeepCopy()
 		roleMap = composeRoleMap(inst)
@@ -136,10 +126,5 @@ func (h *PodRoleEventHandler) updatePodRoleLabel(cli client.Client, reqCtx intct
 	case false:
 		delete(newPod.Labels, constant.RoleLabelKey)
 	}
-
-	if newPod.Annotations == nil {
-		newPod.Annotations = map[string]string{}
-	}
-	newPod.Annotations[constant.LastRoleSnapshotVersionAnnotationKey] = snapshotVersion
 	return cli.Update(reqCtx.Ctx, newPod)
 }

docs/developer_docs/api-reference/cluster.md

@@ -23,9 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	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/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 )
@@ -51,75 +49,59 @@ func (r *alignmentReconciler) PreCondition(tree *kubebuilderx.ObjectTree) *kubeb
 func (r *alignmentReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilderx.Result, error) {
 	inst := tree.GetRoot().(*workloads.Instance)
 
-	newNameSet := sets.New[string](podName(inst))
+	// create pod
 	obj, err := tree.Get(podObj(inst))
 	if err != nil {
 		return kubebuilderx.Continue, err
 	}
-
-	oldNameSet := sets.New[string]()
-	oldPodList := tree.List(&corev1.Pod{})
-	oldPVCList := tree.List(&corev1.PersistentVolumeClaim{})
-	for _, object := range oldPodList {
-		oldNameSet.Insert(object.GetName())
-	}
-	deleteNameSet := oldNameSet.Difference(newNameSet)
-
 	if obj == nil {
-		// create pod
 		newPod, err := buildInstancePod(inst, "")
 		if err != nil {
 			return kubebuilderx.Continue, err
 		}
 		if err := tree.Add(newPod); err != nil {
 			return kubebuilderx.Continue, err
 		}
+	}
 
-		// create PVCs
-		pvcs, err := buildInstancePVCs(inst)
-		if err != nil {
-			return kubebuilderx.Continue, err
-		}
-		for _, pvc := range pvcs {
-			switch oldPvc, err := tree.Get(pvc); {
-			case err != nil:
-				return kubebuilderx.Continue, err
-			case oldPvc == nil:
-				if err = tree.Add(pvc); err != nil {
-					return kubebuilderx.Continue, err
-				}
-			default:
-				// TODO: do not update PVC here
-				pvcObj := copyAndMerge(oldPvc, pvc)
-				if pvcObj != nil {
-					if err = tree.Update(pvcObj); err != nil {
-						return kubebuilderx.Continue, err
-					}
-				}
-			}
-		}
+	// handle pvcs
+	newPVCList, err := buildInstancePVCs(inst)
+	if err != nil {
+		return kubebuilderx.Continue, err
+	}
+	oldPVCList := tree.List(&corev1.PersistentVolumeClaim{})
+
+	newPVCs, oldPVCs := map[string]*corev1.PersistentVolumeClaim{}, map[string]*corev1.PersistentVolumeClaim{}
+	newPVCNameSet, oldPVCNameSet := sets.New[string](), sets.New[string]()
+	for i, pvc := range newPVCList {
+		newPVCs[pvc.Name] = newPVCList[i]
+		newPVCNameSet.Insert(pvc.Name)
+	}
+	for i, pvc := range oldPVCList {
+		oldPVCs[pvc.GetName()] = oldPVCList[i].(*corev1.PersistentVolumeClaim)
+		oldPVCNameSet.Insert(pvc.GetName())
 	}
 
-	// delete useless pod & PVCs
-	for _, object := range oldPodList {
-		pod, _ := object.(*corev1.Pod)
-		if _, ok := deleteNameSet[pod.Name]; !ok {
-			continue
+	createSet := newPVCNameSet.Difference(oldPVCNameSet)
+	deleteSet := oldPVCNameSet.Difference(newPVCNameSet)
+	updateSet := newPVCNameSet.Intersection(oldPVCNameSet)
+
+	for pvcName := range deleteSet {
+		if err = tree.Delete(oldPVCs[pvcName]); err != nil {
+			return kubebuilderx.Continue, err
 		}
-		if err = tree.Delete(pod); err != nil {
+	}
+	for pvcName := range createSet {
+		if err = tree.Add(newPVCs[pvcName]); err != nil {
 			return kubebuilderx.Continue, err
 		}
-
-		retentionPolicy := inst.Spec.PersistentVolumeClaimRetentionPolicy
-		// the default policy is `Delete`
-		if retentionPolicy == nil || retentionPolicy.WhenScaled != kbappsv1.RetainPersistentVolumeClaimRetentionPolicyType {
-			for _, pobj := range oldPVCList {
-				pvc := pobj.(*corev1.PersistentVolumeClaim)
-				if pvc.Labels != nil && pvc.Labels[constant.KBAppPodNameLabelKey] == pod.Name {
-					if err = tree.Delete(pvc); err != nil {
-						return kubebuilderx.Continue, err
-					}
-				}
+	}
+	for pvcName := range updateSet {
+		// TODO: do not update PVC here
+		pvcObj := copyAndMerge(oldPVCs[pvcName], newPVCs[pvcName])
+		if pvcObj != nil {
+			if err = tree.Update(pvcObj); err != nil {
+				return kubebuilderx.Continue, err
 			}
 		}
 	}

pkg/controller/instance/pod_role_event_handler.go

@@ -71,7 +71,11 @@ func (r *assistantObjectReconciler) createOrUpdate(tree *kubebuilderx.ObjectTree
 	}
 	if err != nil || robj == nil {
 		labels := obj.GetLabels()
-		maps.Copy(labels, getMatchLabels(inst.Name))
+		if labels == nil {
+			labels = getMatchLabels(inst.Name)
+		} else {
+			maps.Copy(labels, getMatchLabels(inst.Name))
+		}
 		obj.SetLabels(labels)
 		if err := controllerutil.SetControllerReference(inst, obj, model.GetScheme()); err != nil {
 			return false, err

pkg/controller/instance/reconciler_alignment.go

@@ -38,8 +38,6 @@ import (
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
 )
 
-// updateReconciler handles the updates of instances based on the UpdateStrategy.
-// Currently, two update strategies are supported: 'OnDelete' and 'RollingUpdate'.
 type updateReconciler struct{}
 
 var _ kubebuilderx.Reconciler = &updateReconciler{}

pkg/controller/instance/reconciler_assistant_object.go

@@ -48,7 +48,7 @@ const (
 var (
 	codecs         = serializer.NewCodecFactory(model.GetScheme())
 	patchCodec     = codecs.LegacyCodec(workloads.SchemeGroupVersion)
-	controllerKind = appsv1.SchemeGroupVersion.WithKind("StatefulSet")
+	controllerKind = appsv1.SchemeGroupVersion.WithKind("Instance")
 )
 
 func newRevision(inst *workloads.Instance) (*appsv1.ControllerRevision, error) {

pkg/controller/instance/reconciler_update.go

@@ -220,31 +220,7 @@ func copyAndMergeInstance(oldInst, newInst *workloads.Instance) *workloads.Insta
 	targetInst.Spec.MinReadySeconds = newInst.Spec.MinReadySeconds
 
 	// merge pvcs
-	for i := range newInst.Spec.VolumeClaimTemplates {
-		newPVC := &newInst.Spec.VolumeClaimTemplates[i]
-		oldPVC := &targetInst.Spec.VolumeClaimTemplates[i]
-		mergeMap(&newPVC.Labels, &oldPVC.Labels)
-		mergeMap(&newPVC.Annotations, &oldPVC.Annotations)
-		// resources.request.storage and accessModes support in-place update.
-		// resources.request.storage only supports volume expansion.
-		if reflect.DeepEqual(oldPVC.Spec.AccessModes, newPVC.Spec.AccessModes) &&
-			oldPVC.Spec.Resources.Requests.Storage().Cmp(*newPVC.Spec.Resources.Requests.Storage()) >= 0 {
-			continue
-		}
-		oldPVC.Spec.AccessModes = newPVC.Spec.AccessModes
-		if newPVC.Spec.Resources.Requests == nil {
-			continue
-		}
-		if _, ok := newPVC.Spec.Resources.Requests[corev1.ResourceStorage]; !ok {
-			continue
-		}
-		requests := oldPVC.Spec.Resources.Requests
-		if requests == nil {
-			requests = make(corev1.ResourceList)
-		}
-		requests[corev1.ResourceStorage] = *newPVC.Spec.Resources.Requests.Storage()
-		oldPVC.Spec.Resources.Requests = requests
-	}
+	targetInst.Spec.VolumeClaimTemplates = newInst.Spec.VolumeClaimTemplates
 	targetInst.Spec.PersistentVolumeClaimRetentionPolicy = newInst.Spec.PersistentVolumeClaimRetentionPolicy
 
 	copyAndMergeService := func(old, new *corev1.Service) client.Object {