chore: remove old feature flags and add a new one for Pipeline AnalysisRuns (#937)

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

Author: juliev0

internal/controller/config/config.go

@@ -102,16 +102,11 @@ type GlobalConfig struct {
 	// Configuration specific to Pipeline Type
 	Pipeline PipelineConfig `json:"pipeline" mapstructure:"pipeline"`
 
-	// TODO: remove when no longer needed
-	// FeatureFlagDisallowProgressiveForNonMonoVertex is a TEMPORARY feature flag to disable progressive upgrades for resources other than MonoVertex
-	FeatureFlagDisallowProgressiveForNonMonoVertex bool `json:"featureFlagDisallowProgressiveForNonMonoVertex" mapstructure:"featureFlagDisallowProgressiveForNonMonoVertex"`
-
-	// TODO: remove when no longer needed
-	// FeatureFlagIgnoreAnalysisResult is a TEMPORARY feature flag to ignore the result of an AnalysisRun
-	FeatureFlagIgnoreAnalysisResult bool `json:"featureFlagIgnoreAnalysisResult" mapstructure:"featureFlagIgnoreAnalysisResult"`
-
 	// List of permitted Kinds for Riders
 	PermittedRiders string `json:"permittedRiders" mapstructure:"permittedRiders"`
+
+	// FeatureFlagDisableAnalysisRunsForPipeline is a temporary feature flag to turn off analysis runs for Pipeline type
+	FeatureFlagDisableAnalysisRunsForPipeline bool `json:"featureFlagDisableAnalysisRunsForPipeline" mapstructure:"featureFlagDisableAnalysisRunsForPipeline"`
 }
 
 type PipelineConfig struct {

internal/controller/pipelinerollout/pipelinerollout_progressive.go

@@ -184,8 +184,13 @@ func (r *PipelineRolloutReconciler) checkAnalysisTemplates(ctx context.Context,
 	numaLogger := logger.FromContext(ctx)
 	analysis := pipelineRollout.GetAnalysis()
 
+	globalConfig, err := config.GetConfigManagerInstance().GetConfig()
+	if err != nil {
+		return apiv1.AssessmentResultUnknown, "", fmt.Errorf("error getting the global config: %v", err)
+	}
+
 	// only check for and create AnalysisRun if templates are specified
-	if len(analysis.Templates) > 0 {
+	if len(analysis.Templates) > 0 && !globalConfig.FeatureFlagDisableAnalysisRunsForPipeline {
 		// this will create an AnalysisRun if it doesn't exist yet; or otherwise it will check if it's finished running
 		numaLogger.Debugf("Performing analysis for upgrading child %s", existingUpgradingChildDef.GetName())
 		analysisStatus, err := progressive.PerformAnalysis(ctx, existingUpgradingChildDef, pipelineRollout, pipelineRollout.GetAnalysis(), pipelineRollout.GetAnalysisStatus(), r.client)

internal/controller/progressive/analysis.go

@@ -34,8 +34,6 @@ import (
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-
-	"github.com/numaproj/numaplane/internal/controller/config"
 )
 
 // This function is repurposed from the Argo Rollout codebase here:
@@ -211,16 +209,6 @@ func AssessAnalysisStatus(
 	analysisStatus *apiv1.AnalysisStatus) (apiv1.AssessmentResult, string, error) {
 	numaLogger := logger.FromContext(ctx)
 
-	// check for feature flag to skip checking the AnalysisRun
-	globalConfig, err := config.GetConfigManagerInstance().GetConfig()
-	if err != nil {
-		return apiv1.AssessmentResultUnknown, "", fmt.Errorf("error getting the global config: %v", err)
-	}
-	if globalConfig.FeatureFlagIgnoreAnalysisResult {
-		numaLogger.Debugf("Feature flag set to ignore AnalysisRun")
-		return apiv1.AssessmentResultSuccess, "", nil
-	}
-
 	// make sure we haven't gone past the max time allowed for an AnalysisRun
 	analysisRunTimeout, err := getAnalysisRunTimeout(ctx)
 	if err != nil {

internal/usde/usde.go

@@ -7,7 +7,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	numaflowv1 "github.com/numaproj/numaflow/pkg/apis/numaflow/v1alpha1"
 	"github.com/numaproj/numaplane/internal/common"
 	"github.com/numaproj/numaplane/internal/controller/common/riders"
 	"github.com/numaproj/numaplane/internal/controller/config"
@@ -426,14 +425,5 @@ func GetUserStrategy(ctx context.Context, namespace, resourceKind string) (confi
 		}
 	}
 
-	// TODO: remove when FeatureFlagDisallowProgressiveForNonMonoVertex no longer needed
-	if userUpgradeStrategy == config.ProgressiveStrategyID &&
-		resourceKind != numaflowv1.MonoVertexGroupVersionKind.Kind &&
-		globalConfig.FeatureFlagDisallowProgressiveForNonMonoVertex {
-
-		// Use the next most conservative strategy: PPND
-		userUpgradeStrategy = config.PPNDStrategyID
-	}
-
 	return userUpgradeStrategy, nil
 }