adapt to new lib version

Author: mandelsoft

cmd/main.go

@@ -69,13 +69,14 @@ func main() {
 		MapIndex(direct.IndexKeyEntryZone, IndexKeyEntryZone).
 		MapIndex(direct.IndexKeyZoneParent, IndexKeyZoneParent)
 
-	def := ctrlmgmt.Define(corednsv1alpha1.GroupVersion.Group, "runtime").
+	def := ctrlmgmt.Define(corednsv1alpha1.GroupVersion.Group, cluster.DEFAULT, "runtime", "target", "dataplane", "source").
 		WithScheme(scheme).
 		AddCluster(
 			cluster.Define("runtime", "runtime cluster").WithFallback("dataplane"),
 			cluster.DefineFleet("dataplane", "api cluster for functional controllers", kcp.Type()).WithFallback("target"),
 			cluster.DefineFleet("source", "user api cluster", kcp.Type()).WithFallback("target"),
 			cluster.Define("target", "replication target").WithFallback(cluster.DEFAULT),
+			cluster.DefineFleet(cluster.DEFAULT, "default cluster as fallback for target", kcp.Type()),
 		).
 		AddController(
 			controller.WithMappings(hostedzone.Controller()).

internal/controller/server/common/index.go

@@ -22,7 +22,7 @@ type Request struct {
 }
 
 func (r *Request) Reconcile() reconcile.Problem {
-	zk := zonemodel.ZoneKeyFromObject(r.ClusterName, r.Object)
+	zk := zonemodel.ZoneKeyFromObject(r.Cluster.GetId(), r.Object)
 
 	info, ok, prob := common.GetRootInfo(r, r, r, r.Object, nil)
 	if prob != nil {
@@ -71,7 +71,7 @@ func (r *Request) ReconcileDeleting() reconcile.Problem {
 }
 
 func (r *Request) ReconcileDeleted() reconcile.Problem {
-	zk := zonemodel.NewZoneKey(r.ClusterName, r.Request.Namespace, r.Request.Name)
+	zk := zonemodel.NewZoneKey(r.Cluster.GetId(), r.Request.Namespace, r.Request.Name)
 	r.Info("delete {{key}} from model", "key", zk)
 	r.settings.model.RemoveZone(zk)
 	r.TriggerStatusChanged()

internal/controller/server/hostedzone/request.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"slices"
 
+	"github.com/mandelsoft/goutils/generics"
 	"github.com/mandelsoft/goutils/sliceutils"
 	"github.com/mandelsoft/kubecrtutils/cacheindex"
 	"github.com/mandelsoft/kubecrtutils/component"
@@ -17,7 +18,7 @@ import (
 )
 
 func indexerFactoryNames(ctx context.Context, logger logging.Logger, set types.Clusters) (cacheindex.TypedIndexerFunc[*corednsv1alpha1.CoreDNSEntry], error) {
-	opts := component.DefinitionFromContext(ctx).GetOptions().(*Factory)
+	opts := component.FromContext(ctx).GetOptions().(*Factory)
 
 	return func(obj *corednsv1alpha1.CoreDNSEntry) []string {
 		if obj.Spec.ZoneRef == "" {
@@ -49,8 +50,10 @@ func indexerFactoryNames(ctx context.Context, logger logging.Logger, set types.C
 	}, nil
 }
 
+var SerialKey any = generics.PointerTo("dns.serial.cache")
+
 func indexerFactoryIPs(ctx context.Context, logger logging.Logger, set types.Clusters) (cacheindex.TypedIndexerFunc[*corednsv1alpha1.CoreDNSEntry], error) {
-	opts := component.DefinitionFromContext(ctx).GetOptions().(*Factory)
+	opts := component.FromContext(ctx).GetOptions().(*Factory)
 
 	return func(obj *corednsv1alpha1.CoreDNSEntry) []string {
 		if obj.Spec.ZoneRef == "" {

internal/controller/server/servercomp/indexer.go

@@ -0,0 +1,39 @@
+package servercomp
+
+import (
+	"sync"
+
+	"github.com/mandelsoft/kubecrtutils/ctrlmgmt"
+	"github.com/mandelsoft/kubecrtutils/types"
+	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
+)
+
+type Serial struct {
+	lock  sync.Mutex
+	zones map[mcreconcile.Request]int
+}
+
+func GetSerial(mgr types.ControllerManager) *Serial {
+	return ctrlmgmt.GetData(mgr, SerialKey, newSerial)
+}
+
+func newSerial() *Serial {
+	return &Serial{zones: make(map[mcreconcile.Request]int)}
+}
+
+func (s *Serial) Add(key mcreconcile.Request, id int) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	old := s.zones[key]
+	if id > old {
+		s.zones[key] = id
+	}
+}
+
+func (s *Serial) Get(key mcreconcile.Request) int {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+
+	return s.zones[key]
+}

internal/controller/server/servercomp/serial.go

@@ -46,7 +46,7 @@ func Render(manifests map[string][]byte, values map[string]interface{}) (datapla
 			if m["manifest"] == nil {
 				err = retrieve(ctx, k, result, &dataplane, &runtime)
 			} else {
-				err = retrieve(ctx, k, result, &dataplane, &runtime)
+				err = retrieve(ctx, k, m["manifest"], &dataplane, &runtime)
 			}
 			if err != nil {
 				return nil, nil, err