Remove MaxNew from bundle status

Author: p-se

charts/fleet-crd/templates/crds.yaml

@@ -3293,15 +3293,6 @@ spec:
                       nullable: true
                       type: string
                   type: object
-                maxNew:
-                  description: 'MaxNew is the maximum number of BundleDeployments
-                    that can be created
-
-                    in a single reconciliation. Defaults to 50. Can be configured
-                    via
-
-                    rolloutStrategy.maxNew in the Bundle spec.'
-                  type: integer
                 maxUnavailable:
                   description: 'MaxUnavailable is the maximum number of unavailable
                     deployments. See

internal/cmd/cli/target_test.go

@@ -92,7 +92,7 @@ func Test_stageAllTargets_overwritesExistingMaxNew(t *testing.T) {
 }
 
 func Test_stageAllTargets_preservesExistingRolloutStrategy(t *testing.T) {
-	ten  := 10
+	ten := 10
 	existing := &fleet.RolloutStrategy{
 		AutoPartitionThreshold: &ten,
 	}

internal/cmd/controller/reconciler/bundle_controller.go

@@ -287,7 +287,7 @@ func (r *BundleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	}
 	logger = logger.WithValues("manifestID", manifestID)
 
-	if err := resetStatus(&bundle.Status, matchedTargets, bundle.Spec.RolloutStrategy); err != nil {
+	if err := resetStatus(&bundle.Status, matchedTargets); err != nil {
 		err = fmt.Errorf("failed to reset bundle status from targets: %w", err)
 
 		return ctrl.Result{}, r.updateErrorStatus(ctx, bundleOrig, bundle, err)

internal/cmd/controller/reconciler/bundle_status.go

@@ -8,15 +8,7 @@ import (
 	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 )
 
-// defaultMaxNew mirrors the default in the target package, kept in sync for
-// the status field which reflects the configured value.
-const defaultMaxNew = 50
-
-func resetStatus(status *fleet.BundleStatus, allTargets []*target.Target, rollout *fleet.RolloutStrategy) (err error) {
-	status.MaxNew = defaultMaxNew
-	if rollout != nil && rollout.MaxNew != nil {
-		status.MaxNew = *rollout.MaxNew
-	}
+func resetStatus(status *fleet.BundleStatus, allTargets []*target.Target) (err error) {
 	status.Summary = fleet.BundleSummary{}
 	status.PartitionStatus = nil
 	status.Unavailable = 0

internal/cmd/controller/reconciler/bundle_status_test.go

@@ -8,8 +8,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const defaultMaxNew = 50
-
 type partition struct {
 	Status  fleet.PartitionStatus
 	Targets []*Target
@@ -20,7 +18,7 @@ type partition struct {
 // It updates Deployments in allTargets if they are out of sync (DeploymentID != StagedDeploymentID).
 func UpdatePartitions(status *fleet.BundleStatus, allTargets []*Target) (err error) {
 	rollout := getRollout(allTargets)
-	maxNew := defaultMaxNew
+	maxNew := DefaultMaxNew
 	if rollout.MaxNew != nil {
 		maxNew = *rollout.MaxNew
 	}

internal/cmd/controller/target/partition.go

@@ -529,7 +529,7 @@ func Test_UpdatePartitions_MaxNew(t *testing.T) {
 			name:             "nil maxNew uses default of 50",
 			maxNew:           nil,
 			targetCount:      100,
-			wantNewlyCreated: defaultMaxNew,
+			wantNewlyCreated: DefaultMaxNew,
 		},
 	}
 	for _, tt := range tests {

internal/cmd/controller/target/rollout_test.go

@@ -25,6 +25,11 @@ var (
 	defMaxUnavailablePartitions = intstr.FromInt(0)
 )
 
+const (
+	// DefaultMaxNew is the default value for RolloutStrategy.MaxNew.
+	DefaultMaxNew = 50
+)
+
 const (
 	maxTemplateRecursionDepth = 50
 	clusterLabelPrefix        = "global.fleet.clusterLabels."

internal/cmd/controller/target/target.go

@@ -389,10 +389,6 @@ type BundleStatus struct {
 	// percentage of unavailable partitions.
 	// +optional
 	MaxUnavailablePartitions int `json:"maxUnavailablePartitions"`
-	// MaxNew is the maximum number of BundleDeployments that can be created
-	// in a single reconciliation. Defaults to 50. Can be configured via
-	// rolloutStrategy.maxNew in the Bundle spec.
-	MaxNew int `json:"maxNew,omitempty"`
 	// PartitionStatus lists the status of each partition.
 	PartitionStatus []PartitionStatus `json:"partitions,omitempty"`
 	// Display contains the number of ready, desiredready clusters and a