Add valuesYaml to the catalog upgrade action

guangbochen · Craig Jellick · commit b79eb707e292 · 2019-02-15T13:13:26.000-07:00
Problem: Cannot update valuesYaml field for catalog app in upgrade Solution: Add valuesYaml filed to the catalog upgrade action. Issues: rancher#18111 Related PRs: rancher/types#723
diff --git a/pkg/api/customization/app/app.go b/pkg/api/customization/app/app.go
@@ -115,6 +115,7 @@ func (w Wrapper) ActionHandler(actionName string, action *types.Action, apiConte
 		answers := actionInput["answers"]
 		forceUpgrade := actionInput["forceUpgrade"]
 		files := actionInput["files"]
+		valuesYaml := actionInput["valuesYaml"]
 		_, namespace := ref.Parse(app.ProjectID)
 		obj, err := w.AppGetter.Apps(namespace).Get(app.Name, metav1.GetOptions{})
 		if err != nil {
@@ -148,10 +149,14 @@ func (w Wrapper) ActionHandler(actionName string, action *types.Action, apiConte
 				obj.Spec.ExternalID = "" // ignore externalID
 			}
 		}
+		if valuesYaml != nil {
+			obj.Spec.ValuesYaml = convert.ToString(valuesYaml)
+		}
 
 		if _, err := w.AppGetter.Apps(namespace).Update(obj); err != nil {
 			return err
 		}
+		apiContext.WriteResponse(http.StatusNoContent, map[string]interface{}{})
 		return nil
 	case "rollback":
 		forceUpgrade := actionInput["forceUpgrade"]
@@ -183,6 +188,7 @@ func (w Wrapper) ActionHandler(actionName string, action *types.Action, apiConte
 		if _, err := w.AppGetter.Apps(namespace).Update(obj); err != nil {
 			return err
 		}
+		apiContext.WriteResponse(http.StatusNoContent, map[string]interface{}{})
 		return nil
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ func (w Wrapper) ActionHandler(actionName string, action *types.Action, apiConte`
`115`	`115`	`answers := actionInput["answers"]`
`116`	`116`	`forceUpgrade := actionInput["forceUpgrade"]`
`117`	`117`	`files := actionInput["files"]`
	`118`	`+ valuesYaml := actionInput["valuesYaml"]`
`118`	`119`	`_, namespace := ref.Parse(app.ProjectID)`
`119`	`120`	`obj, err := w.AppGetter.Apps(namespace).Get(app.Name, metav1.GetOptions{})`
`120`	`121`	`if err != nil {`
`@@ -148,10 +149,14 @@ func (w Wrapper) ActionHandler(actionName string, action *types.Action, apiConte`
`148`	`149`	`obj.Spec.ExternalID = "" // ignore externalID`
`149`	`150`	`}`
`150`	`151`	`}`
	`152`	`+ if valuesYaml != nil {`
	`153`	`+ obj.Spec.ValuesYaml = convert.ToString(valuesYaml)`
	`154`	`+ }`
`151`	`155`
`152`	`156`	`if _, err := w.AppGetter.Apps(namespace).Update(obj); err != nil {`
`153`	`157`	`return err`
`154`	`158`	`}`
	`159`	`+ apiContext.WriteResponse(http.StatusNoContent, map[string]interface{}{})`
`155`	`160`	`return nil`
`156`	`161`	`case "rollback":`
`157`	`162`	`forceUpgrade := actionInput["forceUpgrade"]`
`@@ -183,6 +188,7 @@ func (w Wrapper) ActionHandler(actionName string, action *types.Action, apiConte`
`183`	`188`	`if _, err := w.AppGetter.Apps(namespace).Update(obj); err != nil {`
`184`	`189`	`return err`
`185`	`190`	`}`
	`191`	`+ apiContext.WriteResponse(http.StatusNoContent, map[string]interface{}{})`
`186`	`192`	`return nil`
`187`	`193`	`}`
`188`	`194`	`return nil`