addressed comments

Author: Edwinhr716

api/leaderworkerset/v1/leaderworkerset_types.go

@@ -216,7 +216,7 @@ const (
 	// (0, 1, ... subGroupSize-1), (subGroupSize, ... 2*subGroupSize - 1), ...
 	SubGroupPolicyTypeLeaderWorker SubGroupPolicyType = "LeaderWorker"
 
-	// LeaderExcluded excludes the leader from any subgroup. 
+	// LeaderExcluded excludes the leader from any subgroup.
 	// Only supported when (LeaderWorkerSet.Spec.LeaderWorkerTemplate.Size-1) is divisible
 	// by LeaderWorkerSet.Spec.SubGroupPolicy.Size.
 	// Groups will look like:

pkg/controllers/leaderworkerset_controller.go

@@ -668,9 +668,7 @@ func constructLeaderStatefulSetApplyConfiguration(lws *leaderworkerset.LeaderWor
 		podAnnotations[leaderworkerset.ExclusiveKeyAnnotationKey] = lws.Annotations[leaderworkerset.ExclusiveKeyAnnotationKey]
 	}
 	if lws.Spec.LeaderWorkerTemplate.SubGroupPolicy != nil {
-		if *lws.Spec.LeaderWorkerTemplate.SubGroupPolicy.Type == leaderworkerset.SubGroupPolicyTypeLeaderExcluded {
-			podAnnotations[leaderworkerset.SubGroupPolicyTypeAnnotationKey] = string(leaderworkerset.SubGroupPolicyTypeLeaderExcluded)
-		}
+		podAnnotations[leaderworkerset.SubGroupPolicyTypeAnnotationKey] = (string(*lws.Spec.LeaderWorkerTemplate.SubGroupPolicy.Type))
 		podAnnotations[leaderworkerset.SubGroupSizeAnnotationKey] = strconv.Itoa(int(*lws.Spec.LeaderWorkerTemplate.SubGroupPolicy.SubGroupSize))
 		if lws.Annotations[leaderworkerset.SubGroupExclusiveKeyAnnotationKey] != "" {
 			podAnnotations[leaderworkerset.SubGroupExclusiveKeyAnnotationKey] = lws.Annotations[leaderworkerset.SubGroupExclusiveKeyAnnotationKey]

pkg/webhooks/leaderworkerset_webhook.go

@@ -83,12 +83,6 @@ func (r *LeaderWorkerSetWebhook) Default(ctx context.Context, obj runtime.Object
 		lws.Spec.NetworkConfig.SubdomainPolicy = &subdomainPolicy
 	}
 
-	if lws.Spec.LeaderWorkerTemplate.SubGroupPolicy != nil {
-		if lws.Spec.LeaderWorkerTemplate.SubGroupPolicy.Type == nil {
-			subGroupPolicyType := v1.SubGroupPolicyTypeLeaderWorker
-			lws.Spec.LeaderWorkerTemplate.SubGroupPolicy.Type = &subGroupPolicyType
-		}
-	}
 	return nil
 }
 

pkg/webhooks/pod_webhook.go

@@ -126,13 +126,12 @@ func (p *PodWebhook) Default(ctx context.Context, obj runtime.Object) error {
 			SetExclusiveAffinities(pod, groupUniqueKey, epKey, leaderworkerset.GroupUniqueHashLabelKey)
 		}
 		_, foundSubGroupSize := pod.Annotations[leaderworkerset.SubGroupSizeAnnotationKey]
-		_, leaderExcludedSubGroup := pod.Annotations[leaderworkerset.SubGroupPolicyTypeAnnotationKey]
-		if foundSubGroupSize && pod.Labels[leaderworkerset.SubGroupIndexLabelKey] == "" && !leaderExcludedSubGroup {
+		subGroupPolicyType := pod.Annotations[leaderworkerset.SubGroupPolicyTypeAnnotationKey]
+		if foundSubGroupSize && pod.Labels[leaderworkerset.SubGroupIndexLabelKey] == "" && (subGroupPolicyType != string(leaderworkerset.SubGroupPolicyTypeLeaderExcluded)) {
 			// The leader pod always lands on SubGroup 0.
 			pod.Labels[leaderworkerset.SubGroupIndexLabelKey] = "0"
 			subGroupUniqueKey := genGroupUniqueKey(pod.Name, "0")
 			pod.Labels[leaderworkerset.SubGroupUniqueHashLabelKey] = subGroupUniqueKey
-
 			if subEpKey, foundSubEpKey := pod.Annotations[leaderworkerset.SubGroupExclusiveKeyAnnotationKey]; foundSubEpKey {
 				SetExclusiveAffinities(pod, subGroupUniqueKey, subEpKey, leaderworkerset.SubGroupUniqueHashLabelKey)
 			}