From f426389e3fb20730c461b1d1bdeb7e9ce7b90a02 Mon Sep 17 00:00:00 2001 From: devad Date: Mon, 27 Nov 2023 17:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BA=94=E7=94=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2pod=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: devad Former-commit-id: 9bb2c298b0fda3a36a4f9158eca699171ee7066e --- api/desc/pcm.api | 4 +++ api/internal/handler/routes.go | 5 +++ api/internal/logic/apps/apppodslogic.go | 42 +++++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +-- rpc/pcmcore.go | 3 -- 6 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 api/internal/logic/apps/apppodslogic.go diff --git a/api/desc/pcm.api b/api/desc/pcm.api index 844f23ce..f2539457 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -534,4 +534,8 @@ service pcm { @doc "应用详情" @handler AppDetailHandler get /apps/detail/:appName (AppDetailReq) returns (AppDetailResp) + + @doc "应用pods列表" + @handler AppPodsHandler + get /apps/pods/:appName (AppDetailReq) returns (AppDetailResp) } \ No newline at end of file diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index b042695b..f9a94381 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -644,6 +644,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/apps/detail/:appName", Handler: apps.AppDetailHandler(serverCtx), }, + { + Method: http.MethodGet, + Path: "/apps/pods/:appName", + Handler: apps.AppPodsHandler(serverCtx), + }, }, rest.WithPrefix("/pcm/v1"), ) diff --git a/api/internal/logic/apps/apppodslogic.go b/api/internal/logic/apps/apppodslogic.go new file mode 100644 index 00000000..556c46a6 --- /dev/null +++ b/api/internal/logic/apps/apppodslogic.go @@ -0,0 +1,42 @@ +package apps + +import ( + "context" + "gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes/kubernetes" + + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AppPodsLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewAppPodsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AppPodsLogic { + return &AppPodsLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *AppPodsLogic) AppPods(req *types.AppDetailReq) (resp *kubernetes.PodDetailResp, err error) { + resp = &kubernetes.PodDetailResp{} + //调用p端接口查询应用详情 + podList, err := l.svcCtx.K8sRpc[1727670068428410880].GetAppPodsByAppName(context.Background(), &kubernetes.AppDetailReq{ + Namespace: req.NsID, + Name: req.Name, + }) + if err != nil { + logx.Errorf("调用p端接口查询应用详情失败，err:%v", err) + resp.Code = "500" + resp.Msg = err.Error() + return resp, err + } + resp.Code = "200" + return podList, err +} diff --git a/go.mod b/go.mod index 6b4f55bc..44761676 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/zeromicro/go-zero v1.6.0 gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95 gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d - gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231125040801-4f7a37d36a73 + gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231127091355-bdebaff6f702 gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231101091522-38307e241dfd gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231102023739-81a3d353c10d diff --git a/go.sum b/go.sum index d4cb9c5d..46d5e6c3 100644 --- a/go.sum +++ b/go.sum @@ -1000,8 +1000,8 @@ gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95 h1:63M79RcLdA1 gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95/go.mod h1:ySZHK8NpHn4gjbLoOtJbSEUDiYZVwjbnFAcG71gXPgg= gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d h1:DHjl/rLuH2gKYtY0MKMGNQDHFT12APg25RlMUQo+tHk= gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d/go.mod h1:r/KLzUpupCV5jdxSfgDhc2pVjP0fBi3VhAWRttsBn30= -gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231125040801-4f7a37d36a73 h1:VcLuvcNZwiujgngTNnQH3rFDclT2hfquxnBMQac8xX4= -gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231125040801-4f7a37d36a73/go.mod h1:nto0MrfeackGWkbwgkRW45+RIRvwHHqvNqs9Yz+O9j0= +gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231127091355-bdebaff6f702 h1:XgamX/g1CNUn9cda5f228llF/TgZTH3dWjCQmFvmWIc= +gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231127091355-bdebaff6f702/go.mod h1:IcHXpIAkYEX3fGIo/ofVCyMTglgyxG44lEcL1y3GASk= gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 h1:jztlHo72bcWM1jUwvG3Hfk2K+AJL0RvlsdIqlktH/MI= gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090/go.mod h1:pisJKAI8FRFFUcBaH3Gob+ENXWRM97rpuYmv9s1raag= gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231101091522-38307e241dfd h1:9GIKpN6nel4U5jD91HL/vjzwo+EHTpE13SkT7WKyXtQ= diff --git a/rpc/pcmcore.go b/rpc/pcmcore.go index 0009c6e9..3819616c 100644 --- a/rpc/pcmcore.go +++ b/rpc/pcmcore.go @@ -23,7 +23,6 @@ import ( "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/interceptor/rpcserver" commonConfig "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/nacos" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/config" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/cron" participantserviceServer "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/server/participantservice" pcmcoreServer "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/server/pcmcore" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" @@ -74,8 +73,6 @@ func main() { s.AddUnaryInterceptors(rpcserver.LoggerInterceptor) defer s.Stop() - // 初始化定时任务 - cron.InitCron(ctx) logx.Infof("Starting rpc server at %s...\n", c.ListenOn) s.Start() }