MGMT-19148: Revert add OLM operator setup jobs finalizing stage (open…

…shift#6933)" This reverts commit e4326d4. The reverted patch added a new finalizing stage that indicates that the assisted installer controller is waiting for OLM setup jobs to complete. But that will not be implemented, so the change is no longer neded. Related: https://issues.redhat.com/browse/MGMT-19148 Related: https://issues.redhat.com/browse/MGMT-19056
jhernand · Jan 23, 2025 · 5af5345 · 5af5345
1 parent 9df3014
commit 5af5345
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 30 deletions.
diff --git a/api/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go b/api/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go
diff --git a/client/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go b/client/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go
diff --git a/internal/cluster/finalizing_stages.go b/internal/cluster/finalizing_stages.go
@@ -25,7 +25,6 @@ var finalizingStagesTimeoutsDefaultsHardTimeous = map[models.FinalizingStage]tim
 	models.FinalizingStageApplyingOlmManifests:                    shortWaitTimeout,
 	models.FinalizingStageWaitingForOlmOperatorsCsv:               generalWaitTimeout,
 	models.FinalizingStageWaitingForOlmOperatorsCsvInitialization: generalWaitTimeout,
-	models.FinalizingStageWaitingForOLMOperatorSetupJobs:          shortWaitTimeout,
 	models.FinalizingStageDone:                                    shortWaitTimeout,
 }
 
@@ -35,7 +34,6 @@ var finalizingStagesTimeoutsDefaultsSoftTimeouts = map[models.FinalizingStage]ti
 	models.FinalizingStageApplyingOlmManifests:                    shortWaitTimeout,
 	models.FinalizingStageWaitingForOlmOperatorsCsv:               generalWaitTimeout,
 	models.FinalizingStageWaitingForOlmOperatorsCsvInitialization: generalWaitTimeout,
-	models.FinalizingStageWaitingForOLMOperatorSetupJobs:          shortWaitTimeout,
 	models.FinalizingStageDone:                                    shortWaitTimeout,
 }
 
@@ -45,7 +43,6 @@ var finalizingStages = []models.FinalizingStage{
 	models.FinalizingStageApplyingOlmManifests,
 	models.FinalizingStageWaitingForOlmOperatorsCsvInitialization,
 	models.FinalizingStageWaitingForOlmOperatorsCsv,
-	models.FinalizingStageWaitingForOLMOperatorSetupJobs,
 	models.FinalizingStageDone,
 }
 
@@ -55,12 +52,6 @@ var nonFailingFinalizingStages = []models.FinalizingStage{
 	models.FinalizingStageWaitingForOlmOperatorsCsv,
 }
 
-var olmOperatorFinalizingStages = []models.FinalizingStage{
-	models.FinalizingStageWaitingForOlmOperatorsCsvInitialization,
-	models.FinalizingStageWaitingForOlmOperatorsCsv,
-	models.FinalizingStageWaitingForOLMOperatorSetupJobs,
-}
-
 func convertStageToEnvVar(stage models.FinalizingStage) string {
 	return fmt.Sprintf("FINALIZING_STAGE_%s_TIMEOUT", strings.ReplaceAll(strings.ToUpper(string(stage)), " ", "_"))
 }
@@ -89,7 +80,7 @@ func finalizingStageDefaultTimeout(stage models.FinalizingStage, softTimeoutEnab
 
 func finalizingStageTimeout(stage models.FinalizingStage, operators []*models.MonitoredOperator, softTimeoutEnabled bool, log logrus.FieldLogger) time.Duration {
 	timeout := finalizingStageDefaultTimeout(stage, softTimeoutEnabled, log)
-	if funk.Contains(olmOperatorFinalizingStages, stage) {
+	if funk.Contains([]models.FinalizingStage{models.FinalizingStageWaitingForOlmOperatorsCsvInitialization, models.FinalizingStageWaitingForOlmOperatorsCsv}, stage) {
 		timeoutSeconds := timeout.Seconds()
 		for _, m := range operators {
 			if m.OperatorType == models.OperatorTypeOlm {

diff --git a/internal/cluster/finalizing_stages_test.go b/internal/cluster/finalizing_stages_test.go
@@ -32,7 +32,6 @@ var _ = DescribeTable("finalizing stage timeouts",
 			olmStages = []models.FinalizingStage{
 				models.FinalizingStageWaitingForOlmOperatorsCsvInitialization,
 				models.FinalizingStageWaitingForOlmOperatorsCsv,
-				models.FinalizingStageWaitingForOLMOperatorSetupJobs,
 			}
 			nonOlmStages = funk.Subtract(finalizingStages, olmStages).([]models.FinalizingStage)
 			toSeconds    = func(d time.Duration) int64 {

diff --git a/models/finalizing_stage.go b/models/finalizing_stage.go
diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
diff --git a/swagger.yaml b/swagger.yaml
@@ -5205,7 +5205,6 @@ definitions:
     - Applying olm manifests
     - Waiting for olm operators csv initialization
     - Waiting for olm operators csv
-    - Waiting for OLM operator setup jobs
     - Done
 
 

diff --git a/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go b/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go