MGMT-6584 Add host progress stages while waiting for control plane (#…

…1797) Added: - HostStageWaitingForBootkube - HostStageWaitingForController Removed: - HostStageStartWaitingForControlPlane - obsolete
openshift · May 24, 2021 · 7060ae6 · 7060ae6
1 parent d7484ff
commit 7060ae6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 21 deletions.
diff --git a/internal/host/host.go b/internal/host/host.go
@@ -56,27 +56,28 @@ var manualRebootStages = []models.HostStage{
 }
 
 var InstallationProgressTimeout = map[models.HostStage]time.Duration{
-	models.HostStageStartingInstallation:        30 * time.Minute,
-	models.HostStageWaitingForControlPlane:      60 * time.Minute,
-	models.HostStageStartWaitingForControlPlane: 60 * time.Minute,
-	models.HostStageInstalling:                  60 * time.Minute,
-	models.HostStageJoined:                      60 * time.Minute,
-	models.HostStageWritingImageToDisk:          30 * time.Minute,
-	models.HostStageRebooting:                   70 * time.Minute,
-	models.HostStageConfiguring:                 60 * time.Minute,
-	models.HostStageWaitingForIgnition:          24 * time.Hour,
-	"DEFAULT":                                   60 * time.Minute,
+	models.HostStageStartingInstallation:   30 * time.Minute,
+	models.HostStageWaitingForControlPlane: 60 * time.Minute,
+	models.HostStageWaitingForController:   60 * time.Minute,
+	models.HostStageWaitingForBootkube:     60 * time.Minute,
+	models.HostStageInstalling:             60 * time.Minute,
+	models.HostStageJoined:                 60 * time.Minute,
+	models.HostStageWritingImageToDisk:     30 * time.Minute,
+	models.HostStageRebooting:              70 * time.Minute,
+	models.HostStageConfiguring:            60 * time.Minute,
+	models.HostStageWaitingForIgnition:     24 * time.Hour,
+	"DEFAULT":                              60 * time.Minute,
 }
 
 var disconnectionValidationStages = []models.HostStage{
 	models.HostStageWritingImageToDisk,
 	models.HostStageInstalling,
-	models.HostStageStartWaitingForControlPlane,
 }
 
 var WrongBootOrderIgnoreTimeoutStages = []models.HostStage{
-	models.HostStageStartWaitingForControlPlane,
 	models.HostStageWaitingForControlPlane,
+	models.HostStageWaitingForController,
+	models.HostStageWaitingForBootkube,
 	models.HostStageRebooting,
 }
 

diff --git a/internal/host/transition_test.go b/internal/host/transition_test.go
@@ -1282,8 +1282,9 @@ var _ = Describe("Refresh Host", func() {
 			expectTimeout bool
 		}{
 			{models.HostStageRebooting, false},
-			{models.HostStageStartWaitingForControlPlane, false},
 			{models.HostStageWaitingForControlPlane, false},
+			{models.HostStageWaitingForController, false},
+			{models.HostStageWaitingForBootkube, false},
 			{models.HostStageStartingInstallation, true},
 			{models.HostStageInstalling, true},
 			{models.HostStageWritingImageToDisk, true},
@@ -1354,7 +1355,6 @@ var _ = Describe("Refresh Host", func() {
 		installationStages := []models.HostStage{
 			models.HostStageInstalling,
 			models.HostStageWritingImageToDisk,
-			models.HostStageStartWaitingForControlPlane,
 		}
 
 		for j := range installationStages {
@@ -3820,7 +3820,7 @@ var _ = Describe("Refresh Host", func() {
 			for _, installationStage := range []models.HostStage{
 				models.HostStageStartingInstallation,
 				models.HostStageWaitingForControlPlane,
-				models.HostStageStartWaitingForControlPlane,
+				models.HostStageWaitingForController,
 				models.HostStageInstalling,
 				models.HostStageWritingImageToDisk,
 				models.HostStageRebooting,

diff --git a/models/host_stage.go b/models/host_stage.go
diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
diff --git a/swagger.yaml b/swagger.yaml
@@ -4624,7 +4624,8 @@ definitions:
     enum:
       - Starting installation
       - Waiting for control plane
-      - Start waiting for control plane
+      - Waiting for bootkube
+      - Waiting for controller
       - Installing
       - Writing image to disk
       - Rebooting