Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MGMT-19148: Revert add OLM operator setup jobs finalizing stage (#6933)" #7219

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MGMT-19148: Revert add OLM operator setup jobs finalizing stage (#6933)" #7219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions api/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions client/vendor/github.com/openshift/assisted-service/models/finalizing_stage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 1 addition & 10 deletions internal/cluster/finalizing_stages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand All @@ -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,
}

Expand All @@ -45,7 +43,6 @@ var finalizingStages = []models.FinalizingStage{
models.FinalizingStageApplyingOlmManifests,
models.FinalizingStageWaitingForOlmOperatorsCsvInitialization,
models.FinalizingStageWaitingForOlmOperatorsCsv,
models.FinalizingStageWaitingForOLMOperatorSetupJobs,
models.FinalizingStageDone,
}

Expand All @@ -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)), " ", "_"))
}
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion internal/cluster/finalizing_stages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions models/finalizing_stage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions restapi/embedded_spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
5 changes: 1 addition & 4 deletions vendor/github.com/openshift/assisted-service/models/finalizing_stage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.