admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong params naming in openpitrix (#5666)

Browse Source
This commit is contained in:
AS!
2023-05-09 13:54:45 +08:00
committed by GitHub
parent 673fdde52c
commit e140fb387c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kapis/openpitrix/v1/handler.go
View File

@@ -766,13 +766,12 @@ func (h *openpitrixHandler) UpgradeApplication(req *restful.Request, resp *restf
}
upgradeClusterRequest.Namespace = namespace
upgradeClusterRequest.ClusterId = applicationId
user, _ := request.UserFrom(req.Request.Context())
if user != nil {
upgradeClusterRequest.Username = user.GetName()
}
err = h.openpitrix.UpgradeApplication(upgradeClusterRequest)
err = h.openpitrix.UpgradeApplication(upgradeClusterRequest, applicationId)
if err != nil {
klog.Errorln(err)
api.HandleInternalError(resp, nil, err)

15
pkg/models/openpitrix/release.go
View File

@@ -58,7 +58,7 @@ type ReleaseInterface interface {
CreateApplication(workspace, clusterName, namespace string, request CreateClusterRequest) error
ModifyApplication(request ModifyClusterAttributesRequest) error
DeleteApplication(workspace, clusterName, namespace, id string) error
UpgradeApplication(request UpgradeClusterRequest) error
UpgradeApplication(request UpgradeClusterRequest, applicationId string) error
}
type releaseOperator struct {
@@ -92,12 +92,11 @@ type Application struct {
ReleaseInfo []runtime.Object `json:"releaseInfo,omitempty" description:"release info"`
}
func (c *releaseOperator) UpgradeApplication(request UpgradeClusterRequest) error {
oldRls, err := c.rlsLister.Get(request.ClusterId)
func (c *releaseOperator) UpgradeApplication(request UpgradeClusterRequest, applicationId string) error {
oldRls, err := c.rlsLister.Get(applicationId)
// todo check namespace
if err != nil {
klog.Errorf("get release %s/%s failed, error: %s", request.Namespace, request.ClusterId, err)
klog.Errorf("get release %s/%s failed, error: %s", request.Namespace, applicationId, err)
return err
}
@@ -130,12 +129,12 @@ func (c *releaseOperator) UpgradeApplication(request UpgradeClusterRequest) erro
patch := client.MergeFrom(oldRls)
data, _ := patch.Data(newRls)
_, err = c.rlsClient.Patch(context.TODO(), request.ClusterId, patch.Type(), data, metav1.PatchOptions{})
_, err = c.rlsClient.Patch(context.TODO(), applicationId, patch.Type(), data, metav1.PatchOptions{})
if err != nil {
klog.Errorf("patch release %s/%s failed, error: %s", request.Namespace, request.ClusterId, err)
klog.Errorf("patch release %s/%s failed, error: %s", request.Namespace, applicationId, err)
return err
} else {
klog.V(2).Infof("patch release %s/%s success", request.Namespace, request.ClusterId)
klog.V(2).Infof("patch release %s/%s success", request.Namespace, applicationId)
}
return nil