From 06ec191e65c128979870adbeaf92c863458e62a6 Mon Sep 17 00:00:00 2001 From: Sai Date: Sun, 29 Sep 2024 15:04:37 +0800 Subject: [PATCH 1/2] try fix check depend --- pkg/apiserver/service/v1/handler_install.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apiserver/service/v1/handler_install.go b/pkg/apiserver/service/v1/handler_install.go index 32a014b..bdbb589 100644 --- a/pkg/apiserver/service/v1/handler_install.go +++ b/pkg/apiserver/service/v1/handler_install.go @@ -34,9 +34,9 @@ func checkDep(app *models.ApplicationInfo, token string) error { return err } - if len(depsResp.Data) <= 0 { - return nil - } + // if len(depsResp.Data) <= 0 { + // return nil + // } notInstalled, err := json.Marshal(depsResp.Data) if err != nil { From 772f990dab6b18bd041ab50ace194b9d1dab7088 Mon Sep 17 00:00:00 2001 From: Sai Date: Sun, 29 Sep 2024 15:12:54 +0800 Subject: [PATCH 2/2] try fix check depend --- pkg/apiserver/service/v1/handler_dev.go | 10 +++++----- pkg/apiserver/service/v1/handler_install.go | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/apiserver/service/v1/handler_dev.go b/pkg/apiserver/service/v1/handler_dev.go index a62ccd5..29cbed7 100644 --- a/pkg/apiserver/service/v1/handler_dev.go +++ b/pkg/apiserver/service/v1/handler_dev.go @@ -223,11 +223,11 @@ func (h *Handler) devUpload(req *restful.Request, resp *restful.Response) { } if install { - err = checkDep(info, token) - if err != nil { - respDepErr(resp, err.Error()) - return - } + // err = checkDep(info, token) + // if err != nil { + // respDepErr(resp, err.Error()) + // return + // } resBody, err := installByType(info, token) if err != nil { diff --git a/pkg/apiserver/service/v1/handler_install.go b/pkg/apiserver/service/v1/handler_install.go index bdbb589..9a2dc92 100644 --- a/pkg/apiserver/service/v1/handler_install.go +++ b/pkg/apiserver/service/v1/handler_install.go @@ -34,9 +34,9 @@ func checkDep(app *models.ApplicationInfo, token string) error { return err } - // if len(depsResp.Data) <= 0 { - // return nil - // } + if len(depsResp.Data) <= 0 { + return nil + } notInstalled, err := json.Marshal(depsResp.Data) if err != nil { @@ -69,10 +69,10 @@ func installPre(appName, token string) (*models.ApplicationInfo, error) { return info, errors.New("get chart name failed") } - err = checkDep(info, token) - if err != nil { - return info, err - } + // err = checkDep(info, token) + // if err != nil { + // return info, err + // } err = appmgr.DownloadAppTgz(info.ChartName) if err != nil {