add restart deployment API

src/backend/controllers/openapi/deployment.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
+	"time"
 
 	"github.com/Qihoo360/wayne/src/backend/client"
 	"github.com/Qihoo360/wayne/src/backend/controllers/common"
@@ -37,6 +39,17 @@ type DeploymentStatusParam struct {
 	Cluster string `json:"cluster"`
 }
 
+// swagger:parameters RestartDeploymentParam
+type RestartDeploymentParam struct {
+	// in: query
+	// Required: true
+	Deployment string `json:"deployment"`
+	// Required: true
+	Namespace string `json:"namespace"`
+	// Required: true
+	Cluster string `json:"cluster"`
+}
+
 // swagger:parameters UpgradeDeploymentParam
 type UpgradeDeploymentParam struct {
 	// in: query
@@ -201,6 +214,75 @@ func (c *OpenAPIController) GetDeploymentStatus() {
 	}
 }
 
+// swagger:route GET /restart_deployment deploy RestartDeploymentParam
+//
+// 用于用户调用以实现强制重启部署
+//
+// 该接口只能使用 app 级别的 apikey，这样做的目的主要是防止 apikey 的滥用
+//
+//     Responses:
+//       200: responseSuccess
+//       400: responseState
+//       401: responseState
+//       500: responseState
+// @router /restart_deployment [get]
+func (c *OpenAPIController) RestartDeployment() {
+	param := RestartDeploymentParam{
+		Deployment: c.GetString("deployment"),
+		Namespace:  c.GetString("namespace"),
+		Cluster:    c.GetString("cluster"),
+	}
+	if !c.CheckoutRoutePermission(RestartDeploymentAction) || !c.CheckDeploymentPermission(param.Deployment) || !c.CheckNamespacePermission(param.Namespace) {
+		return
+	}
+	if len(param.Namespace) == 0 {
+		c.AddErrorAndResponse(fmt.Sprintf("Invalid namespace parameter"), http.StatusBadRequest)
+		return
+	}
+	if len(param.Deployment) == 0 {
+		c.AddErrorAndResponse(fmt.Sprintf("Invalid deployment parameter"), http.StatusBadRequest)
+		return
+	}
+	ns, err := models.NamespaceModel.GetByName(param.Namespace)
+	if err != nil {
+		c.AddErrorAndResponse(fmt.Sprintf("Failed get namespace by name(%s)", param.Namespace), http.StatusBadRequest)
+		return
+	}
+	err = json.Unmarshal([]byte(ns.MetaData), &ns.MetaDataObj)
+	if err != nil {
+		logs.Error(fmt.Sprintf("Failed to parse metadata: %s", err.Error()))
+		c.AddErrorAndResponse("", http.StatusInternalServerError)
+		return
+	}
+	deployResource, err := models.DeploymentModel.GetByName(param.Deployment)
+	if err != nil {
+		c.AddErrorAndResponse(fmt.Sprintf("Failed get deployment by name(%s)", param.Deployment), http.StatusBadRequest)
+		return
+	}
+
+	cli, err := client.Client(param.Cluster)
+	if err != nil {
+		logs.Error("Failed to connect to k8s client", err)
+		c.AddErrorAndResponse(fmt.Sprintf("Failed to connect to k8s client on %s!", param.Cluster), http.StatusInternalServerError)
+		return
+	}
+
+	deployObj, err := resdeployment.GetDeployment(cli, param.Deployment, ns.MetaDataObj.Namespace)
+	if err != nil {
+		logs.Error("Failed to get deployment from k8s client", err.Error())
+		c.AddErrorAndResponse(fmt.Sprintf("Failed to get deployment from k8s client on %s!", param.Cluster), http.StatusInternalServerError)
+		return
+	}
+	deployObj.Spec.Template.ObjectMeta.Labels["timestamp"] = strconv.FormatInt(time.Now().Unix(), 10)
+
+	if err := updateDeployment(deployObj, param.Cluster, c.APIKey.String(), "Restart Deployment", deployResource.Id); err != nil {
+		logs.Error("Failed to restart from k8s client", err.Error())
+		c.AddErrorAndResponse(fmt.Sprintf("Failed to restart from k8s client on %s!", param.Cluster), http.StatusInternalServerError)
+		return
+	}
+	c.HandleResponse(nil)
+}
+
 // swagger:route GET /upgrade_deployment deploy UpgradeDeploymentParam
 //
 // 用于 CI/CD 中的集成升级部署
@@ -225,13 +307,7 @@ func (c *OpenAPIController) UpgradeDeployment() {
 		Description: c.GetString("description"),
 		Images:      c.GetString("images"),
 	}
-	if !c.CheckoutRoutePermission(UpgradeDeploymentAction) {
-		return
-	}
-	if !c.CheckDeploymentPermission(param.Deployment) {
-		return
-	}
-	if !c.CheckNamespacePermission(param.Namespace) {
+	if !c.CheckoutRoutePermission(UpgradeDeploymentAction) || !c.CheckDeploymentPermission(param.Deployment) || !c.CheckNamespacePermission(param.Namespace) {
 		return
 	}
 	param.clusters = strings.Split(param.Cluster, ",")
@@ -385,13 +461,7 @@ func (c *OpenAPIController) ScaleDeployment() {
 		Namespace:  c.GetString("namespace"),
 		Cluster:    c.GetString("cluster"),
 	}
-	if !c.CheckoutRoutePermission(ScaleDeploymentAction) {
-		return
-	}
-	if !c.CheckDeploymentPermission(param.Deployment) {
-		return
-	}
-	if !c.CheckNamespacePermission(param.Namespace) {
+	if !c.CheckoutRoutePermission(ScaleDeploymentAction) || !c.CheckDeploymentPermission(param.Deployment) || !c.CheckNamespacePermission(param.Namespace) {
 		return
 	}
 	var err error
@@ -404,7 +474,6 @@ func (c *OpenAPIController) ScaleDeployment() {
 		c.AddErrorAndResponse(fmt.Sprintf("Invalid replicas parameter: %d not in range (0,32]", param.Replicas), http.StatusBadRequest)
 		return
 	}
-
 	if len(param.Namespace) == 0 {
 		c.AddErrorAndResponse(fmt.Sprintf("Invalid namespace parameter"), http.StatusBadRequest)
 		return
@@ -413,6 +482,7 @@ func (c *OpenAPIController) ScaleDeployment() {
 		c.AddErrorAndResponse(fmt.Sprintf("Invalid deployment parameter"), http.StatusBadRequest)
 		return
 	}
+
 	ns, err := models.NamespaceModel.GetByName(param.Namespace)
 	if err != nil {
 		c.AddErrorAndResponse(fmt.Sprintf("Failed get namespace by name(%s)", param.Namespace), http.StatusBadRequest)
@@ -449,32 +519,19 @@ func (c *OpenAPIController) ScaleDeployment() {
 		c.AddErrorAndResponse(fmt.Sprintf("Failed to get deployment from k8s client on %s!", param.Cluster), http.StatusInternalServerError)
 		return
 	}
-
-	msg := fmt.Sprintf("[APIKey][Original Copies: %d][Target Copies: %d] %s", *deployObj.Spec.Replicas, param.Replicas, c.GetString("description"))
-
-	publishHistory := &models.PublishHistory{
-		Type:         models.PublishTypeDeployment,
-		ResourceId:   deployResource.Id,
-		ResourceName: deployObj.Name,
-		TemplateId:   0,
-		Cluster:      param.Cluster,
-		User:         c.APIKey.String(),
-		Message:      msg,
-	}
-	defer models.PublishHistoryModel.Add(publishHistory)
-
 	replicas32 := int32(param.Replicas)
 	deployObj.Spec.Replicas = &replicas32
-
-	_, err = resdeployment.UpdateDeployment(cli, deployObj)
-	if err != nil {
+	if err := updateDeployment(deployObj, param.Cluster, c.APIKey.String(), "Scale Deployment", deployResource.Id); err != nil {
 		logs.Error("Failed to upgrade from k8s client", err.Error())
 		c.AddErrorAndResponse(fmt.Sprintf("Failed to upgrade from k8s client on %s!", param.Cluster), http.StatusInternalServerError)
 		return
 	}
-	models.DeploymentModel.Update(replicas32, deployResource, param.Cluster)
+	err = models.DeploymentModel.Update(replicas32, deployResource, param.Cluster)
+	if err != nil {
+		// 非敏感错误，无须暴露给用户
+		logs.Error("Failed to update deployment in db!", err.Error())
+	}
 	c.HandleResponse(nil)
-	return
 }
 
 // 主要用于从数据库中查找、拼凑出用于更新的模板资源，资源主要用于 k8s 数据更新和 数据库存储更新记录等
@@ -585,3 +642,37 @@ func publishDeployment(deployInfo *DeploymentInfo, username string) error {
 		return fmt.Errorf("Failed to get k8s client(cluster: %s): %v", deployInfo.Cluster.Name, err)
 	}
 }
+
+func updateDeployment(deployObj *v1beta1.Deployment, cluster string, name string, msg string, resourceId int64) error {
+	status, err := models.PublishStatusModel.GetByCluster(models.PublishTypeDeployment, resourceId, cluster)
+	if err != nil {
+		return fmt.Errorf("Failed to get publish status by cluster: %s", err.Error())
+	}
+	publishHistory := &models.PublishHistory{
+		Type:         models.PublishTypeDeployment,
+		ResourceId:   resourceId,
+		ResourceName: deployObj.Name,
+		TemplateId:   status.TemplateId,
+		Cluster:      cluster,
+		User:         name,
+		Message:      msg,
+	}
+	defer models.PublishHistoryModel.Add(publishHistory)
+	cli, err := client.Client(cluster)
+	if err != nil {
+		return err
+	}
+	_, err = resdeployment.UpdateDeployment(cli, deployObj)
+	if err != nil {
+		publishHistory.Status = models.ReleaseFailure
+		publishHistory.Message = err.Error()
+		return fmt.Errorf("Failed to update deployment by k8s client: %s", err.Error())
+	} else {
+		publishHistory.Status = models.ReleaseSuccess
+		err := models.PublishStatusModel.Add(resourceId, status.TemplateId, cluster, models.PublishTypeDeployment)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+}

src/backend/controllers/openapi/openapi.go

@@ -49,6 +49,7 @@ const (
 	GetDeploymentStatusAction = "GET_DEPLOYMENT_STATUS"
 	UpgradeDeploymentAction   = "UPGRADE_DEPLOYMENT"
 	ScaleDeploymentAction     = "SCALE_DEPLOYMENT"
+	RestartDeploymentAction   = "RESTART_DEPLOYMENT"
 	PermissionPrefix          = "OPENAPI_"
 )
 

src/backend/routers/commentsRouter_controllers_openapi.go

@@ -31,6 +31,14 @@ func init() {
 			MethodParams:     param.Make(),
 			Params:           nil})
 
+	beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/openapi:OpenAPIController"] = append(beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/openapi:OpenAPIController"],
+		beego.ControllerComments{
+			Method:           "RestartDeployment",
+			Router:           `/restart_deployment`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Params:           nil})
+
 	beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/openapi:OpenAPIController"] = append(beego.GlobalControllerRouter["github.com/Qihoo360/wayne/src/backend/controllers/openapi:OpenAPIController"],
 		beego.ControllerComments{
 			Method:           "ScaleDeployment",