地图页取项目下工作负载列表bug修复,deployment增加默认端口设置

This commit is contained in:
zhouqunjie 2022-06-29 21:47:55 +08:00
parent b8a2ec6963
commit 24e6b0a977
3 changed files with 21 additions and 31 deletions

8
.idea/.gitignore vendored
View File

@ -1,8 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -40,6 +40,9 @@ func CreateDeployment(c *gin.Context) {
defaultLabels := map[string]string{"jcce": "true"}
namespace := dpRequest.Namespace
if dpRequest.Port == 0 {
dpRequest.Port = 80
}
var replicas = dpRequest.Replicas
deployment := &appv1.Deployment{
ObjectMeta: metav1.ObjectMeta{

View File

@ -142,7 +142,7 @@ func ListNamespace(c *gin.Context) {
//DescribeNamespace 查询Namespace详情
func DescribeNamespace(c *gin.Context) {
//
namespace, _ := c.GetQuery("namespace")
now := time.Now()
@ -157,11 +157,7 @@ func DescribeNamespace(c *gin.Context) {
nsDescribe, _ := clientSet.CoreV1().Namespaces().Get(context.TODO(), namespace, opts)
//集群工作负载分配到的所有集群和域的集合
//
//clusterSet := make([]ClusterResult, 0)
//domainSet := make([]DomainResult, 0)
//集群工作负载分配到的所有集群和域的集合,这里的数字可以从控制平面来取
deploymentList, err := clientSet.AppsV1().Deployments(namespace).List(context.TODO(), metav1.ListOptions{})
if err != nil {
Response(c, http.StatusInternalServerError, "list deployment failed", err)
@ -177,7 +173,7 @@ func DescribeNamespace(c *gin.Context) {
}
//查询该ns下的分布在不同集群的所有deployment
//查询该ns下的分布在不同集群的所有deployment这里通过karmadactl来取
cmdKmd := karmadactl.NewKarmadaCtlCommand("karmadactl", "karmadactl")
cmdKmd.SetArgs([]string{"get", "deployment", "-n", namespace, "--show-labels"})
if err := cmdKmd.Execute(); err != nil {
@ -198,7 +194,8 @@ func DescribeNamespace(c *gin.Context) {
Response(c, http.StatusInternalServerError, "json marshal failed", err)
return
}
deployResult := Deployment{}
//通过karmadactl取到遍历一个集群中的deploy
for j := 0; j < len(respNamespace.Get("rows").MustArray()); j++ {
/*
@ -212,11 +209,11 @@ func DescribeNamespace(c *gin.Context) {
6 = {interface{} | string} "nginx:1.16.1" 容器镜像
7 = {interface{} | string} "business=gpu,provider=jcce,region=changsha" 标签
*/
deployJson := respNamespace.Get("rows").GetIndex(i)
deployName, _ := deployJson.Get("cells").GetIndex(0).String()
podNumRequire, _ := deployJson.Get("cells").GetIndex(2).Int64()
containerName, _ := deployJson.Get("cells").GetIndex(5).String()
containerImage, _ := deployJson.Get("cells").GetIndex(6).String()
deployJson := respNamespace.Get("rows").GetIndex(j).Get("cells")
deployName, _ := deployJson.GetIndex(0).String()
podNumRequire, _ := deployJson.GetIndex(2).Int64()
containerName, _ := deployJson.GetIndex(5).String()
containerImage, _ := deployJson.GetIndex(6).String()
//通过cluster name从数据库获取 其域名
db, _ := InitDB()
@ -240,16 +237,14 @@ func DescribeNamespace(c *gin.Context) {
}
}
deployResult := Deployment{
Name: deployName,
Namespace: namespace,
Labels: nil,
ContainerName: containerName,
ContainerImage: containerImage,
Replicas: int32(podNumRequire),
Cluster: clusterName,
Domain: domainName,
}
deployResult.Name = deployName
deployResult.Namespace = namespace
deployResult.ContainerImage = containerImage
deployResult.ContainerName = containerName
deployResult.Replicas = int32(podNumRequire)
deployResult.Cluster = clusterName
deployResult.Domain = domainName
domainResult := Domain{
DomainId: domainId,
DomainName: domainName,