update

Author: leon-inf

controllers/apps/component/transformer_component_service.go

@@ -292,7 +292,7 @@ func (t *componentServiceTransformer) createOrUpdateService(ctx graph.TransformC
 			o, _ := strconv.Atoi(subs[len(subs)-1])
 			return o
 		}
-		multicluster.Assign(ctx.GetContext(), service, ordinal)
+		multicluster.Assign(ctx.GetContext(), service, ordinal) // TODO: pod service
 	}
 
 	createOrUpdateService := func(service *corev1.Service) error {

controllers/workloads/instanceset_controller_2.go

@@ -87,11 +87,11 @@ func (r *InstanceSetReconciler2) setupWithMultiClusterManager(mgr ctrl.Manager,
 		For(&workloads.InstanceSet{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: viper.GetInt(constant.CfgKBReconcileWorkers),
-		})
+		}).
+		Owns(&corev1.Service{}) // headless service
 
 	eventHandler := handler.EnqueueRequestsFromMapFunc(r.instanceFilter)
-	multiClusterMgr.Watch(b, &workloads.Instance{}, eventHandler).
-		Watch(b, &corev1.Service{}, eventHandler) // headless service
+	multiClusterMgr.Watch(b, &workloads.Instance{}, eventHandler)
 
 	return b.Complete(r)
 }

pkg/controller/component/service_reference.go

@@ -154,7 +154,7 @@ func referencedServiceVars(ctx context.Context, cli client.Reader, namespace str
 	case len(selector.Service.Component) == 0:
 		obj, err = clusterServiceGetter(ctx, cli, svcNamespace, selector.Cluster, selector.Service.Service)
 	case selector.Service.Service == "headless":
-		obj, err = headlessCompServiceGetter(ctx, cli, svcNamespace, selector.Cluster, selector.Service.Component)
+		obj, err = headlessServiceGetter(ctx, cli, svcNamespace, selector.Cluster, selector.Service.Component)
 	default:
 		obj, err = compServiceGetter(ctx, cli, svcNamespace, selector.Cluster, selector.Service.Component, selector.Service.Service)
 	}

pkg/controller/component/utils.go

@@ -42,7 +42,7 @@ import (
 )
 
 func inDataContext() *multicluster.ClientOption {
-	return multicluster.InDataContext()
+	return multicluster.InDataContext() // TODO
 }
 
 func ValidateDefNameRegexp(defNamePattern string) error {

pkg/controller/component/vars.go

@@ -925,7 +925,7 @@ func resolveServiceVarRefLow(ctx context.Context, cli client.Reader, synthesized
 	selector appsv1.ServiceVarSelector, option *appsv1.VarOption, resolveVar func(any) (*corev1.EnvVar, *corev1.EnvVar, error)) ([]*corev1.EnvVar, []*corev1.EnvVar, error) {
 	resolveObjs := func() (map[string]any, error) {
 		headlessGetter := func(compName string) (any, error) {
-			return headlessCompServiceGetter(ctx, cli, synthesizedComp.Namespace, synthesizedComp.ClusterName, compName)
+			return headlessServiceGetter(ctx, cli, synthesizedComp.Namespace, synthesizedComp.ClusterName, compName)
 		}
 		getter := func(compName string) (any, error) {
 			return compServiceGetter(ctx, cli, synthesizedComp.Namespace, synthesizedComp.ClusterName, compName, selector.Name)
@@ -944,7 +944,7 @@ func clusterServiceGetter(ctx context.Context, cli client.Reader, namespace, clu
 		Name:      constant.GenerateClusterServiceName(clusterName, name),
 	}
 	obj := &corev1.Service{}
-	err := cli.Get(ctx, key, obj, inDataContext())
+	err := cli.Get(ctx, key, obj, inDataContext()) // TODO: cluster service
 	return &resolvedServiceObj{service: obj}, err
 }
 
@@ -975,18 +975,18 @@ func compServiceGetter(ctx context.Context, cli client.Reader, namespace, cluste
 		Name:      svcName,
 	}
 	obj := &corev1.Service{}
-	err = cli.Get(ctx, key, obj, inDataContext())
+	err = cli.Get(ctx, key, obj, inDataContext()) // TODO: cmp service
 	if err == nil {
 		return &resolvedServiceObj{service: obj}, nil
 	}
-	if err != nil && !apierrors.IsNotFound(err) {
+	if !apierrors.IsNotFound(err) {
 		return nil, err
 	}
 
 	// fall-back to list services and find the matched prefix
 	svcList := &corev1.ServiceList{}
 	matchingLabels := client.MatchingLabels(constant.GetCompLabels(clusterName, compName))
-	err = cli.List(ctx, svcList, matchingLabels, inDataContext())
+	err = cli.List(ctx, svcList, matchingLabels, inDataContext()) // TODO: cmp service
 	if err != nil {
 		return nil, err
 	}
@@ -1003,13 +1003,13 @@ func compServiceGetter(ctx context.Context, cli client.Reader, namespace, cluste
 	return &resolvedServiceObj{podServices: objs}, nil
 }
 
-func headlessCompServiceGetter(ctx context.Context, cli client.Reader, namespace, clusterName, compName string) (any, error) {
+func headlessServiceGetter(ctx context.Context, cli client.Reader, namespace, clusterName, compName string) (any, error) {
 	key := types.NamespacedName{
 		Namespace: namespace,
 		Name:      constant.GenerateDefaultComponentHeadlessServiceName(clusterName, compName),
 	}
 	obj := &corev1.Service{}
-	err := cli.Get(ctx, key, obj, inDataContext())
+	err := cli.Get(ctx, key, obj, inDataContext()) // TODO: headless service
 	return &resolvedServiceObj{service: obj}, err
 }
 

pkg/controller/component/workload_utils.go

@@ -60,7 +60,7 @@ func ListOwnedPVCs(ctx context.Context, cli client.Reader, namespace, clusterNam
 	if opts == nil {
 		opts = make([]client.ListOption, 0)
 	}
-	opts = append(opts, inDataContext())
+	opts = append(opts, inDataContext()) // TODO: pvc
 	return listObjWithLabelsInNamespace(ctx, cli, generics.PersistentVolumeClaimSignature, namespace, labels, opts...)
 }
 
@@ -99,7 +99,7 @@ func listPods(ctx context.Context, cli client.Reader, namespace, clusterName, co
 	if opts == nil {
 		opts = make([]client.ListOption, 0)
 	}
-	opts = append(opts, inDataContext())
+	opts = append(opts, inDataContext()) // TODO: pod
 	return listObjWithLabelsInNamespace(ctx, cli, generics.PodSignature, namespace, labels, opts...)
 }
 

pkg/controller/kubebuilderx/utils.go

@@ -26,11 +26,11 @@ import (
 	"strconv"
 	"strings"
 
-	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"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/model"
 	"github.com/apecloud/kubeblocks/pkg/controller/multicluster"
@@ -92,8 +92,7 @@ func placement(obj client.Object) string {
 
 func assign(ctx context.Context, obj client.Object) client.Object {
 	switch obj.(type) {
-	// only handle Pod and PersistentVolumeClaim
-	case *corev1.Pod, *corev1.PersistentVolumeClaim:
+	case *workloads.Instance: // TODO
 		ordinal := func() int {
 			subs := strings.Split(obj.GetName(), "-")
 			o, _ := strconv.Atoi(subs[len(subs)-1])