bugfix for clusternet#688

pkg/controllermanager/deployer/deployer.go

@@ -734,6 +734,17 @@ func (deployer *Deployer) handleBase(baseCopy *appsapi.Base) error {
 		return err
 	}
 
+	// If the sub associated with base is a dividing strategy, check if there are derived loc resources, if not, do not create desc
+	if sub, _ := deployer.subsController.FindSubByUID(baseCopy.Labels[known.ConfigSubscriptionUIDLabel]); sub != nil {
+		if sub.Spec.SchedulingStrategy == appsapi.DividingSchedulingStrategyType {
+			if locs, _ := deployer.locLister.Localizations(baseCopy.Namespace).List(labels.SelectorFromSet(labels.Set{
+				string(sub.UID): subscriptionKind.Kind,
+			})); len(locs) == 0 {
+				return fmt.Errorf("Waiting loc for Base %s", klog.KObj(baseCopy))
+			}
+		}
+	}
+
 	err := deployer.populateDescriptions(baseCopy)
 	if err != nil {
 		return err

pkg/controllers/apps/subscription/subscription.go

@@ -52,6 +52,7 @@ type Controller struct {
 
 	clusternetClient clusternetclientset.Interface
 	subsLister       applisters.SubscriptionLister
+	subsIndexer      cache.Indexer
 	recorder         record.EventRecorder
 	syncHandlerFunc  SyncHandlerFunc
 }
@@ -68,6 +69,7 @@ func NewController(
 	c := &Controller{
 		clusternetClient: clusternetClient,
 		subsLister:       subsInformer.Lister(),
+		subsIndexer:      subsInformer.Informer().GetIndexer(),
 		recorder:         recorder,
 		syncHandlerFunc:  syncHandlerFunc,
 	}
@@ -107,8 +109,13 @@ func NewController(
 			return true, nil
 		})
 
+	err := subsInformer.Informer().AddIndexers(cache.Indexers{known.IndexKeyForSubscriptionUID: utils.SubUidIndexFunc})
+	if err != nil {
+		return nil, err
+	}
+
 	// Manage the addition/update of Subscription
-	_, err := subsInformer.Informer().AddEventHandler(yachtController.DefaultResourceEventHandlerFuncs())
+	_, err = subsInformer.Informer().AddEventHandler(yachtController.DefaultResourceEventHandlerFuncs())
 	if err != nil {
 		return nil, err
 	}
@@ -255,3 +262,12 @@ func (c *Controller) patchSubscriptionLabels(sub *appsapi.Subscription, labels m
 		patchData,
 		metav1.PatchOptions{})
 }
+
+func (c *Controller) FindSubByUID(uid string) (*appsapi.Subscription, error) {
+	objs, err := c.subsIndexer.ByIndex(known.IndexKeyForSubscriptionUID, uid)
+	if err != nil || len(objs) == 0 {
+		return nil, fmt.Errorf("find base by uid %s failed: %v %d", uid, err, len(objs))
+	}
+
+	return objs[0].(*appsapi.Subscription), nil
+}