Deprecate PodDecoration spec.injectStrategy.group

apis/apps/v1alpha1/poddecoration_types.go

@@ -149,16 +149,6 @@ type PodDecorationUpdateStrategy struct {
 	RollingUpdate *PodDecorationRollingUpdate `json:"rollingUpdate,omitempty"`
 }
 
-type PodDecorationInjectStrategy struct {
-	// Group provides the name of the group this PodDecoration belongs to.
-	// Only one PodDecoration is active when multiple PodDecorations share the same group value.
-	Group string `json:"group,omitempty"`
-	// Weight indicates the priority to apply for a group of PodDecorations with same group value.
-	// The greater one has higher priority to apply.
-	// Default value is 0.
-	Weight *int32 `json:"weight,omitempty"`
-}
-
 type PodDecorationRollingUpdate struct {
 	// Partition controls the update progress by indicating how many pods should be updated.
 	// Partition value indicates the number of Pods which should be updated to the updated revision.
@@ -187,8 +177,10 @@ type PodDecorationSpec struct {
 	// UpdateStrategy carries the strategy configuration for update.
 	UpdateStrategy PodDecorationUpdateStrategy `json:"updateStrategy,omitempty"`
 
-	// InjectStrategy carries the strategy configuration for injection
-	InjectStrategy PodDecorationInjectStrategy `json:"injectStrategy,omitempty"`
+	// Weight indicates the priority to apply for a group of PodDecorations with same group value.
+	// The greater one has higher priority to apply.
+	// Default value is 0.
+	Weight *int32 `json:"weight,omitempty"`
 
 	// Template includes the decoration message about pod template.
 	Template PodDecorationPodTemplate `json:"template,omitempty"`

config/crd/bases/apps.kusionstack.io_poddecorations.yaml

@@ -77,22 +77,6 @@ spec:
                   defaults to 20
                 format: int32
                 type: integer
-              injectStrategy:
-                description: InjectStrategy carries the strategy configuration for
-                  injection
-                properties:
-                  group:
-                    description: Group provides the name of the group this PodDecoration
-                      belongs to. Only one PodDecoration is active when multiple PodDecorations
-                      share the same group value.
-                    type: string
-                  weight:
-                    description: Weight indicates the priority to apply for a group
-                      of PodDecorations with same group value. The greater one has
-                      higher priority to apply. Default value is 0.
-                    format: int32
-                    type: integer
-                type: object
               selector:
                 description: Selector is a label query over pods that should be injected
                   with PodDecoration
@@ -5394,6 +5378,12 @@ spec:
                         x-kubernetes-map-type: atomic
                     type: object
                 type: object
+              weight:
+                description: Weight indicates the priority to apply for a group of
+                  PodDecorations with same group value. The greater one has higher
+                  priority to apply. Default value is 0.
+                format: int32
+                type: integer
             type: object
           status:
             description: PodDecorationStatus defines the observed state of PodDecoration

pkg/controllers/collaset/utils/poddecoration.go

@@ -37,7 +37,6 @@ type PodDecorationGetter interface {
 	GetDecorationByRevisions(ctx context.Context, revisions ...string) (map[string]*appsv1alpha1.PodDecoration, error)
 	GetLatestDecorationsByTargetLabel(ctx context.Context, labels map[string]string) (map[string]*appsv1alpha1.PodDecoration, error)
 	GetUpdatedDecorationsByOldPod(ctx context.Context, pod *corev1.Pod) (map[string]*appsv1alpha1.PodDecoration, error)
-	GetUpdatedDecorationsByOldRevisions(ctx context.Context, labels map[string]string, oldPDRevisions map[string]string) (map[string]*appsv1alpha1.PodDecoration, error)
 }
 
 func NewPodDecorationGetter(ctx context.Context, c client.Client, namespace string) (PodDecorationGetter, error) {
@@ -102,22 +101,17 @@ func (p *podDecorationGetter) GetUpdatedDecorationsByOldPod(ctx context.Context,
 	for _, info := range infos {
 		oldRevisions[info.Name] = info.Revision
 	}
-	return p.GetUpdatedDecorationsByOldRevisions(ctx, pod.Labels, oldRevisions)
+	return p.getUpdatedDecorationsByOldRevisions(ctx, pod.Labels, oldRevisions)
 }
 
-func (p *podDecorationGetter) GetUpdatedDecorationsByOldRevisions(ctx context.Context, labels map[string]string, oldPDRevisions map[string]string) (map[string]*appsv1alpha1.PodDecoration, error) {
+func (p *podDecorationGetter) getUpdatedDecorationsByOldRevisions(ctx context.Context, labels map[string]string, oldPDRevisions map[string]string) (map[string]*appsv1alpha1.PodDecoration, error) {
 	updatedRevisions, _ := utilspoddecoration.GetEffectiveRevisionsFormLatestDecorations(p.latestPodDecorations, labels)
-	// key: Group name, value: PodDecoration name
-	effectiveGroup := map[string]string{}
 	updatedPDs, err := p.GetDecorationByRevisions(ctx, updatedRevisions.List()...)
 	if err != nil {
 		return nil, err
 	}
 	// delete updated PodDecorations in old revisions
 	for _, pd := range updatedPDs {
-		if pd.Spec.InjectStrategy.Group != "" {
-			effectiveGroup[pd.Spec.InjectStrategy.Group] = pd.Name
-		}
 		delete(oldPDRevisions, pd.Name)
 	}
 
@@ -131,19 +125,6 @@ func (p *podDecorationGetter) GetUpdatedDecorationsByOldRevisions(ctx context.Co
 	if err != nil {
 		return nil, err
 	}
-	// delete updated group in old stable PodDecorations
-	var shouldDeleteRevisions []string
-	for rev, pd := range oldStablePDs {
-		group := pd.Spec.InjectStrategy.Group
-		if group != "" {
-			if _, ok := effectiveGroup[group]; ok {
-				shouldDeleteRevisions = append(shouldDeleteRevisions, rev)
-			}
-		}
-	}
-	for _, rev := range shouldDeleteRevisions {
-		delete(oldStablePDs, rev)
-	}
 
 	for rev, pd := range oldStablePDs {
 		if p.latestPodDecorationNames.Has(pd.Name) {