take the headless service as an assistant object

Author: leon-inf

controllers/workloads/instanceset_controller2.go

@@ -59,7 +59,6 @@ func (r *InstanceSetReconciler2) Reconcile(ctx context.Context, req ctrl.Request
 		Do(instanceset2.NewStatusReconciler()).
 		Do(instanceset2.NewRevisionUpdateReconciler()).
 		Do(instanceset2.NewHeadlessServiceReconciler()).
-		// Do(instanceset2.NewAssistantObjectReconciler()).
 		Do(instanceset2.NewAlignmentReconciler()).
 		Do(instanceset2.NewUpdateReconciler()).
 		Commit()

pkg/controller/instance/reconciler_assistant_object.go

@@ -144,21 +144,18 @@ func (r *assistantObjectReconciler) create(tree *kubebuilderx.ObjectTree, inst *
 	// if err := controllerutil.SetControllerReference(inst, obj, model.GetScheme()); err != nil {
 	//	return err
 	// }
-	tree.Logger.Info("create object", "kind", obj.GetObjectKind().GroupVersionKind().Kind, "name", obj.GetName(), "labels", obj.GetLabels())
 	return tree.Add(obj)
 }
 
 func (r *assistantObjectReconciler) update(tree *kubebuilderx.ObjectTree, assistantObj workloads.InstanceAssistantObject, robj, obj client.Object) error {
 	ng, og := r.generation(obj), r.generation(robj)
 	if ng > 0 && og > 0 && ng < og {
-		tree.Logger.Info("skip update object", "kind", obj.GetObjectKind().GroupVersionKind().Kind, "name", obj.GetName(), "labels", obj.GetLabels())
 		return nil
 	}
 	merged := r.copyAndMerge(assistantObj, robj, obj)
 	if merged == nil {
 		return nil
 	}
-	tree.Logger.Info("update object", "kind", obj.GetObjectKind().GroupVersionKind().Kind, "name", obj.GetName(), "labels", obj.GetLabels())
 	return tree.Update(merged)
 }
 

pkg/controller/instanceset2/reconciler_assistant_object.go

@@ -20,9 +20,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package instanceset2
 
 import (
+	"fmt"
+	"slices"
+	"strings"
+
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	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/kubebuilderx"
 	"github.com/apecloud/kubeblocks/pkg/controller/model"
 	intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
@@ -36,7 +44,7 @@ type headlessServiceReconciler struct{}
 
 var _ kubebuilderx.Reconciler = &headlessServiceReconciler{}
 
-func (a *headlessServiceReconciler) PreCondition(tree *kubebuilderx.ObjectTree) *kubebuilderx.CheckResult {
+func (r *headlessServiceReconciler) PreCondition(tree *kubebuilderx.ObjectTree) *kubebuilderx.CheckResult {
 	if tree.GetRoot() == nil || model.IsObjectDeleting(tree.GetRoot()) {
 		return kubebuilderx.ConditionUnsatisfied
 	}
@@ -46,7 +54,7 @@ func (a *headlessServiceReconciler) PreCondition(tree *kubebuilderx.ObjectTree)
 	return kubebuilderx.ConditionSatisfied
 }
 
-func (a *headlessServiceReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilderx.Result, error) {
+func (r *headlessServiceReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilderx.Result, error) {
 	its, _ := tree.GetRoot().(*workloads.InstanceSet)
 	var headlessService *corev1.Service
 	if !its.Spec.DisableDefaultHeadlessService {
@@ -65,21 +73,93 @@ func (a *headlessServiceReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (ku
 		return kubebuilderx.Continue, err
 	}
 
+	skipToReconcileOpt := kubebuilderx.SkipToReconcile(shouldCloneInstanceAssistantObjects(its))
 	if oldHeadlessService == nil && headlessService != nil {
-		if err := tree.Add(headlessService); err != nil {
+		if err := tree.AddWithOption(headlessService, skipToReconcileOpt); err != nil {
 			return kubebuilderx.Continue, err
 		}
 	}
 	if oldHeadlessService != nil && headlessService != nil {
 		newObj := copyAndMerge(oldHeadlessService, headlessService)
-		if err := tree.Update(newObj); err != nil {
+		if err := tree.Update(newObj, skipToReconcileOpt); err != nil {
 			return kubebuilderx.Continue, err
 		}
 	}
 	if oldHeadlessService != nil && headlessService == nil {
-		if err := tree.Delete(oldHeadlessService); err != nil {
+		if err := tree.DeleteWithOption(oldHeadlessService, skipToReconcileOpt); err != nil {
 			return kubebuilderx.Continue, err
 		}
 	}
+
+	if headlessService != nil {
+		r.addHeadlessService(its, headlessService)
+	} else {
+		r.deleteHeadlessService(its, oldHeadlessService)
+	}
+
 	return kubebuilderx.Continue, nil
 }
+
+func (r *headlessServiceReconciler) addHeadlessService(its *workloads.InstanceSet, svc *corev1.Service) {
+	if shouldCloneInstanceAssistantObjects(its) && svc != nil {
+		if its.Spec.InstanceAssistantObjects == nil {
+			its.Spec.InstanceAssistantObjects = make([]corev1.ObjectReference, 0)
+		}
+		gvk, _ := model.GetGVKName(svc)
+		its.Spec.InstanceAssistantObjects = append(its.Spec.InstanceAssistantObjects,
+			corev1.ObjectReference{
+				Kind:      gvk.Kind,
+				Namespace: gvk.Namespace,
+				Name:      gvk.Name,
+			})
+	}
+}
+
+func (r *headlessServiceReconciler) deleteHeadlessService(its *workloads.InstanceSet, obj client.Object) {
+	var svc *corev1.Service
+	if obj != nil {
+		svc = obj.(*corev1.Service)
+	}
+	if svc != nil {
+		gvk, _ := model.GetGVKName(svc)
+		its.Spec.InstanceAssistantObjects = slices.DeleteFunc(its.Spec.InstanceAssistantObjects,
+			func(o corev1.ObjectReference) bool {
+				return o.Kind == gvk.Kind && o.Namespace == gvk.Namespace && o.Name == gvk.Name
+			})
+	}
+}
+
+func getHeadlessSvcSelector(its *workloads.InstanceSet) map[string]string {
+	selectors := make(map[string]string)
+	for k, v := range its.Spec.Selector.MatchLabels {
+		selectors[k] = v
+	}
+	selectors[constant.KBAppReleasePhaseKey] = constant.ReleasePhaseStable
+	return selectors
+}
+
+func buildHeadlessSvc(its workloads.InstanceSet, labels, selectors map[string]string) *corev1.Service {
+	hdlBuilder := builder.NewHeadlessServiceBuilder(its.Namespace, getHeadlessSvcName(its.Name)).
+		AddLabelsInMap(labels).
+		AddSelectorsInMap(selectors).
+		SetPublishNotReadyAddresses(true)
+
+	portNames := sets.New[string]()
+	for _, container := range its.Spec.Template.Spec.Containers {
+		for _, port := range container.Ports {
+			servicePort := corev1.ServicePort{
+				Protocol: port.Protocol,
+				Port:     port.ContainerPort,
+			}
+			switch {
+			case len(port.Name) > 0 && !portNames.Has(port.Name):
+				portNames.Insert(port.Name)
+				servicePort.Name = port.Name
+			default:
+				servicePort.Name = fmt.Sprintf("%s-%d", strings.ToLower(string(port.Protocol)), port.ContainerPort)
+			}
+			hdlBuilder.AddPorts(servicePort)
+		}
+	}
+	return hdlBuilder.GetObject()
+}