Просмотр исходного кода

Merge pull request #1789 from porter-dev/belanger/add-blue-green-fallback

Add fallback field to blue-green deployment spec
abelanger5 4 лет назад
Родитель
Сommit
0669cc6285
2 измененных файлов с 16 добавлено и 12 удалено
  1. 12 9
      cli/cmd/bluegreen.go
  2. 4 3
      cli/cmd/deploy/deploy.go

+ 12 - 9
cli/cmd/bluegreen.go

@@ -141,17 +141,19 @@ func bluegreenSwitch(_ *types.GetAuthenticatedUserResponse, client *api.Client,
 					if currActiveImage == "" {
 						err = deployAgent.UpdateImageAndValues(map[string]interface{}{
 							"bluegreen": map[string]interface{}{
-								"enabled":        true,
-								"activeImageTag": tag,
-								"imageTags":      []string{tag},
+								"enabled":                  true,
+								"disablePrimaryDeployment": true,
+								"activeImageTag":           tag,
+								"imageTags":                []string{tag},
 							},
 						})
 					} else {
 						err = deployAgent.UpdateImageAndValues(map[string]interface{}{
 							"bluegreen": map[string]interface{}{
-								"enabled":        true,
-								"activeImageTag": tag,
-								"imageTags":      []string{currActiveImage, tag},
+								"enabled":                  true,
+								"disablePrimaryDeployment": true,
+								"activeImageTag":           tag,
+								"imageTags":                []string{currActiveImage, tag},
 							},
 						})
 					}
@@ -192,9 +194,10 @@ func bluegreenSwitch(_ *types.GetAuthenticatedUserResponse, client *api.Client,
 
 	err = deployAgent.UpdateImageAndValues(map[string]interface{}{
 		"bluegreen": map[string]interface{}{
-			"enabled":        true,
-			"activeImageTag": tag,
-			"imageTags":      []string{tag},
+			"enabled":                  true,
+			"disablePrimaryDeployment": true,
+			"activeImageTag":           tag,
+			"imageTags":                []string{tag},
 		},
 	})
 

+ 4 - 3
cli/cmd/deploy/deploy.go

@@ -347,9 +347,10 @@ func (d *DeployAgent) UpdateImageAndValues(overrideValues map[string]interface{}
 	// this has been modified already and inserted into overrideValues.
 	if activeBlueGreenTagVal != "" && activeBlueGreenTagVal != d.tag {
 		mergedValues["bluegreen"] = map[string]interface{}{
-			"enabled":        true,
-			"activeImageTag": activeBlueGreenTagVal,
-			"imageTags":      []string{activeBlueGreenTagVal, d.tag},
+			"enabled":                  true,
+			"disablePrimaryDeployment": true,
+			"activeImageTag":           activeBlueGreenTagVal,
+			"imageTags":                []string{activeBlueGreenTagVal, d.tag},
 		}
 	}