floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据应用名称查询pod列表 

Signed-off-by: devad <cossjie@foxmail.com>

Former-commit-id: 9bb2c298b0fda3a36a4f9158eca699171ee7066e
This commit is contained in:
devad 2023-11-27 17:33:34 +08:00
parent c4615e3c18
commit f426389e3f
6 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/desc/pcm.api
View File

@ -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)
}

5
api/internal/handler/routes.go
View File

@ -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"),
)

42
api/internal/logic/apps/apppodslogic.go Normal file
View File

@ -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
}

2
go.mod
View File

@ -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

4
go.sum
View File

@ -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=

3
rpc/pcmcore.go
View File

@ -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()
}