remove other collasets podContext if nesscessary

KusionStack · Jan 7, 2025 · bae2a85 · bae2a85
1 parent 00f1c9a
commit bae2a85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: kusionstack/kuperator
+  newName: coldsteelrail/kusion-kuperator
   newTag: test
diff --git a/pkg/controllers/collaset/podcontext/podcontext.go b/pkg/controllers/collaset/podcontext/podcontext.go
@@ -62,9 +62,11 @@ func AllocateID(c client.Client, instance *appsv1alpha1.CollaSet, defaultRevisio
 		detail := &podContext.Spec.Contexts[i]
 		if detail.Contains(OwnerContextKey, instance.Name) {
 			ownedIDs[detail.ID] = detail
+			existingIDs[detail.ID] = detail
+		} else if instance.Spec.ScaleStrategy.Context != "" {
+			// add other collaset podContexts only if context pool enabled
+			existingIDs[detail.ID] = detail
 		}
-
-		existingIDs[detail.ID] = detail
 	}
 
 	// if owner has enough ID, return
@@ -150,7 +152,7 @@ func doUpdatePodContext(c client.Client, instance *appsv1alpha1.CollaSet, ownedI
 	// store all IDs crossing all workload
 	existingIDs := map[int]*appsv1alpha1.ContextDetail{}
 
-	// add other collaset podContexts only when instance enables context pool
+	// add other collaset podContexts only if context pool enabled
 	if instance.Spec.ScaleStrategy.Context != "" {
 		for i := range podContext.Spec.Contexts {
 			detail := podContext.Spec.Contexts[i]