add huawei pod

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

adaptor/pod_adaptor/service/poder/ali.go

@@ -1,95 +0,0 @@
-package poder
-
-import (
-	"context"
-	"sync"
-
-	"gitlink.org.cn/JCCE/PCM/common/tenanter"
-	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbpod"
-	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbtenant"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
-	alipod "github.com/aliyun/alibaba-cloud-sdk-go/services/eci"
-	"github.com/pkg/errors"
-)
-
-var aliClientMutex sync.Mutex
-
-type AliPod struct {
-	cli      *alipod.Client
-	region   tenanter.Region
-	tenanter tenanter.Tenanter
-}
-
-func newAliPodClient(region tenanter.Region, tenant tenanter.Tenanter) (Poder, error) {
-	var (
-		client *alipod.Client
-		err    error
-	)
-
-	switch t := tenant.(type) {
-	case *tenanter.AccessKeyTenant:
-		// 阿里云的sdk有一个 map 的并发问题，go test 加上-race 能检测出来，所以这里加一个锁
-		aliClientMutex.Lock()
-		client, err = alipod.NewClientWithAccessKey(region.GetName(), t.GetId(), t.GetSecret())
-		aliClientMutex.Unlock()
-	default:
-	}
-
-	if err != nil {
-		return nil, errors.Wrap(err, "init ali pod client error")
-	}
-
-	return &AliPod{
-		cli:      client,
-		region:   region,
-		tenanter: tenant,
-	}, nil
-}
-
-func (pod *AliPod) ListDetail(ctx context.Context, req *pbpod.ListDetailReq) (*pbpod.ListDetailResp, error) {
-	request := alipod.CreateDescribeContainerGroupsRequest()
-	request.Limit = requests.NewInteger(int(req.PageSize))
-	request.RegionId = pod.region.GetName()
-	request.NextToken = req.NextToken
-	resp, err := pod.cli.DescribeContainerGroups(request)
-	if err != nil {
-		return nil, errors.Wrap(err, "Aliyun ListDetail error")
-	}
-
-	var podes = make([]*pbpod.PodInstance, len(resp.ContainerGroups))
-	for k, v := range resp.ContainerGroups {
-		podes[k] = &pbpod.PodInstance{
-			Provider:     pbtenant.CloudProvider_ali,
-			AccountName:  pod.tenanter.AccountName(),
-			InstanceId:   v.ContainerGroupId,
-			InstanceName: v.ContainerGroupName,
-			RegionName:   pod.region.GetName(),
-			PublicIps:    v.InternetIp,
-			InstanceType: v.InstanceType,
-			Cpu:          int32(v.Cpu),
-			Memory:       int32(v.Memory),
-			//Description:     v.Description,
-			Status:       v.Status,
-			CreationTime: v.CreationTime,
-			ExpireTime:   v.ExpiredTime,
-			//InnerIps:        v.IntranetIp,
-			VpcId: v.VpcId,
-			//SecurityGroupId: v.SecurityGroupId
-		}
-	}
-
-	isFinished := false
-	if len(podes) < int(req.PageSize) {
-		isFinished = true
-	}
-
-	return &pbpod.ListDetailResp{
-		Pods:       podes,
-		Finished:   isFinished,
-		PageNumber: req.PageNumber + 1,
-		PageSize:   req.PageSize,
-		NextToken:  resp.NextToken,
-		RequestId:  resp.RequestId,
-	}, nil
-}

adaptor/pod_adaptor/service/poder/huawei.go

@@ -1,163 +0,0 @@
-package poder
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/golang/glog"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbpod"
-	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbtenant"
-
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/tools/clientcmd/api"
-
-	huaweipod "k8s.io/client-go/kubernetes"
-
-	"github.com/pkg/errors"
-	"gitlink.org.cn/JCCE/PCM/common/tenanter"
-)
-
-var huaweiClientMutex sync.Mutex
-
-type HuaweiPod struct {
-	cli      *huaweipod.Clientset
-	region   tenanter.Region
-	tenanter tenanter.Tenanter
-}
-
-const (
-	apiVersion  = "client.authentication.k8s.io/v1beta1"
-	iamEndpoint = "https://iam.myhuaweicloud.com"
-)
-
-func newHuaweiPodClient(region tenanter.Region, tenant tenanter.Tenanter) (Poder, error) {
-	var (
-		client *huaweipod.Clientset
-		err    error
-	)
-	cciEndpoint := "https://cci." + region.GetName() + ".myhuaweicloud.com"
-	cciConfig, err := clientcmd.BuildConfigFromFlags(cciEndpoint, "")
-	if err != nil {
-		return nil, err
-	}
-
-	switch t := tenant.(type) {
-	case *tenanter.AccessKeyTenant:
-		// 阿里云的sdk有一个 map 的并发问题，go test 加上-race 能检测出来，所以这里加一个锁
-		huaweiClientMutex.Lock()
-		var optionArgs []string
-		optionArgs = append(optionArgs, fmt.Sprintf("--iam-endpoint=%s", iamEndpoint))
-		optionArgs = append(optionArgs, fmt.Sprintf("--project-name=%s", region.GetName()))
-		optionArgs = append(optionArgs, fmt.Sprintf("--ak=%s", t.GetId()))
-		optionArgs = append(optionArgs, fmt.Sprintf("--sk=%s", t.GetSecret()))
-		cciConfig.ExecProvider = &api.ExecConfig{
-			Command:    "cci-iam-authenticator",
-			APIVersion: apiVersion,
-			Args:       append([]string{"token"}, optionArgs...),
-			Env:        make([]api.ExecEnvVar, 0),
-		}
-		client, err = huaweipod.NewForConfig(cciConfig)
-		huaweiClientMutex.Unlock()
-	default:
-	}
-
-	if err != nil {
-		return nil, errors.Wrap(err, "init huawei pod client error")
-	}
-
-	return &HuaweiPod{
-		cli:      client,
-		region:   region,
-		tenanter: tenant,
-	}, nil
-}
-
-func (pod *HuaweiPod) ListDetail(ctx context.Context, req *pbpod.ListDetailReq) (*pbpod.ListDetailResp, error) {
-	resp, err := pod.cli.CoreV1().Pods(req.GetNamespace()).List(metav1.ListOptions{})
-	if err != nil {
-		return nil, errors.Wrap(err, "Huaweiyun ListDetail pod error")
-	}
-	glog.Info("Huaweiyun ListDetail pod success", resp.Items)
-	var podes = make([]*pbpod.PodInstance, len(resp.Items))
-	for k, v := range resp.Items {
-		podes[k] = &pbpod.PodInstance{
-			Provider:     pbtenant.CloudProvider_huawei,
-			AccountName:  pod.tenanter.AccountName(),
-			InstanceId:   string(v.GetUID()),
-			InstanceName: v.Name,
-			RegionName:   pod.region.GetName(),
-			PublicIps:    v.Status.PodIP,
-			//InstanceType: v.InstanceType,
-			//Cpu:    v.Spec.Containers[0].Resources.Requests.Cpu(),
-			//Memory: v.Spec.Containers[0].Resources.Requests.Memory(),
-			//Description:     v.Description,
-			Status:       string(v.Status.Phase),
-			CreationTime: v.CreationTimestamp.String(),
-			//ExpireTime:   v.ExpiredTime,
-			//InnerIps:        v.IntranetIp,
-			//VpcId: v.VpcId,
-			//SecurityGroupId: v.SecurityGroupId
-		}
-	}
-
-	isFinished := false
-	if len(podes) < int(req.PageSize) {
-		isFinished = true
-	}
-
-	return &pbpod.ListDetailResp{
-		Pods:       podes,
-		Finished:   isFinished,
-		PageNumber: req.PageNumber + 1,
-		PageSize:   req.PageSize,
-		//NextToken:  resp.NextToken,
-		//RequestId: resp.RequestId,
-	}, nil
-}
-
-func (pod *HuaweiPod) create(ctx context.Context, req *pbpod.ListDetailReq) (*pbpod.ListDetailResp, error) {
-	resp, err := pod.cli.CoreV1().Pods(req.GetNamespace()).List(metav1.ListOptions{})
-	if err != nil {
-		return nil, errors.Wrap(err, "Huaweiyun ListDetail pod error")
-	}
-	glog.Info("Huaweiyun ListDetail pod success", resp.Items)
-	var podes = make([]*pbpod.PodInstance, len(resp.Items))
-	for k, v := range resp.Items {
-		podes[k] = &pbpod.PodInstance{
-			Provider:     pbtenant.CloudProvider_huawei,
-			AccountName:  pod.tenanter.AccountName(),
-			InstanceId:   string(v.GetUID()),
-			InstanceName: v.Name,
-			RegionName:   pod.region.GetName(),
-			PublicIps:    v.Status.PodIP,
-			//InstanceType: v.InstanceType,
-			//Cpu:    v.Spec.Containers[0].Resources.Requests.Cpu(),
-			//Memory: v.Spec.Containers[0].Resources.Requests.Memory(),
-			//Description:     v.Description,
-			Status:       string(v.Status.Phase),
-			CreationTime: v.CreationTimestamp.String(),
-			//ExpireTime:   v.ExpiredTime,
-			//InnerIps:        v.IntranetIp,
-			//VpcId: v.VpcId,
-			//SecurityGroupId: v.SecurityGroupId
-		}
-	}
-
-	isFinished := false
-	if len(podes) < int(req.PageSize) {
-		isFinished = true
-	}
-
-	return &pbpod.ListDetailResp{
-		Pods:       podes,
-		Finished:   isFinished,
-		PageNumber: req.PageNumber + 1,
-		PageSize:   req.PageSize,
-		//NextToken:  resp.NextToken,
-		//RequestId: resp.RequestId,
-	}, nil
-}

adaptor/pod_adaptor/service/poder/huawei_cci.go

@@ -1,135 +1,155 @@
 package poder
 
-//
-//import (
-//	"fmt"
-//	"gitlink.org.cn/JCCE/PCM/adaptor/pod_adaptor/common/config"
-//	corev1 "k8s.io/api/core/v1"
-//	"k8s.io/apimachinery/pkg/api/resource"
-//	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-//	"k8s.io/client-go/kubernetes"
-//)
-//
-//// CreatePod 创建Pod
-//func CreatePod(client *kubernetes.Clientset, configPath string) (*corev1.Pod, error) {
-//
-//	var configCommon config.PCMContainerConfig
-//	configCommon, _ = config.PCMconfig(configPath)
-//
-//	nameSpace := configCommon.NameSpace
-//	podName := configCommon.ContainerGroupName
-//	containerImage := configCommon.ContainerImage
-//	containerName := configCommon.ContainerName
-//	cpuPod := configCommon.CpuPod
-//	memoryPod := configCommon.MemoryPod
-//	pod := corev1.Pod{
-//		TypeMeta: metav1.TypeMeta{
-//			APIVersion: "core/V1",
-//			Kind:       "Pod",
-//		},
-//		ObjectMeta: metav1.ObjectMeta{
-//			Name:      podName,
-//			Namespace: nameSpace,
-//			Labels:    map[string]string{"name": "testapi"},
-//		},
-//		Spec: corev1.PodSpec{
-//			RestartPolicy: corev1.RestartPolicyAlways,
-//			Containers: []corev1.Container{
-//				{
-//					Name:  containerName,
-//					Image: containerImage,
-//					Resources: corev1.ResourceRequirements{
-//						Limits: map[corev1.ResourceName]resource.Quantity{
-//							corev1.ResourceCPU:    resource.MustParse(cpuPod),
-//							corev1.ResourceMemory: resource.MustParse(memoryPod),
-//						},
-//					},
-//				},
-//			},
-//		},
-//		Status: corev1.PodStatus{},
-//	}
-//
-//	fmt.Println("Huawei ContainerGroup created")
-//	return client.CoreV1().Pods(nameSpace).Create(&pod)
-//}
-//
-//// ListPod 查询Namespace下Pod列表
-//func ListPod(client *kubernetes.Clientset, configPath string) (*corev1.PodList, error) {
-//
-//	var configCommon config.PCMContainerConfig
-//	configCommon, _ = config.PCMconfig(configPath)
-//
-//	nameSpace := configCommon.NameSpace
-//
-//	podList, _ := client.CoreV1().Pods(nameSpace).List(metav1.ListOptions{})
-//	fmt.Println("Huawei ContainerGroup list", podList)
-//
-//	return podList, nil
-//}
-//
-//// UpdatePod 更新指定Pod
-///*
-////    跨namespace目前有点问题
-//*/
-//func UpdatePod(client *kubernetes.Clientset, configPath string) (*corev1.Pod, error) {
-//
-//	var configCommon config.PCMContainerConfig
-//	configCommon, _ = config.PCMconfig(configPath)
-//
-//	nameSpace := configCommon.NamespaceUpdate
-//	podName := configCommon.ContainerGroupNameUpdate
-//	containerImage := configCommon.ContainerImageUpdate
-//	containerName := configCommon.ContainerNameUpdate
-//
-//	pod := corev1.Pod{
-//		TypeMeta: metav1.TypeMeta{
-//			APIVersion: "core/V1",
-//			Kind:       "Pod",
-//		},
-//		ObjectMeta: metav1.ObjectMeta{
-//			Name:      podName,
-//			Namespace: nameSpace,
-//			Labels:    map[string]string{"name": "pod-test2"},
-//		},
-//		Spec: corev1.PodSpec{
-//			RestartPolicy: corev1.RestartPolicyAlways,
-//			Containers: []corev1.Container{
-//				{
-//					Name:  containerName,
-//					Image: containerImage,
-//					Resources: corev1.ResourceRequirements{
-//						Limits: map[corev1.ResourceName]resource.Quantity{
-//							corev1.ResourceLimitsCPU:    resource.MustParse("500m"),
-//							corev1.ResourceLimitsMemory: resource.MustParse("1Gi"),
-//						},
-//						Requests: map[corev1.ResourceName]resource.Quantity{
-//							corev1.ResourceRequestsCPU:    resource.MustParse("500m"),
-//							corev1.ResourceRequestsMemory: resource.MustParse("1Gi"),
-//						},
-//					},
-//				},
-//			},
-//		},
-//		Status: corev1.PodStatus{},
-//	}
-//
-//	podNew, _ := client.CoreV1().Pods(nameSpace).Update(&pod)
-//	fmt.Println("Huawei ContainerGroup updated", podNew)
-//
-//	return podNew, nil
-//}
-//
-//// DeletePod 删除指定Pod
-//func DeletePod(client *kubernetes.Clientset, configPath string) error {
-//
-//	var configCommon config.PCMContainerConfig
-//	configCommon, _ = config.PCMconfig(configPath)
-//
-//	nameSpace := configCommon.NameSpace
-//	podName := configCommon.ContainerGroupName
-//
-//	fmt.Println("Huawei ContainerGroup:", podName, " Deleted")
-//
-//	return client.CoreV1().Pods(nameSpace).Delete(podName, &metav1.DeleteOptions{})
-//}
+import (
+	"context"
+	"fmt"
+	"sync"
+
+	"github.com/golang/glog"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbpod"
+	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbtenant"
+
+	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/tools/clientcmd/api"
+
+	huaweicci "k8s.io/client-go/kubernetes"
+
+	"github.com/pkg/errors"
+	"gitlink.org.cn/JCCE/PCM/common/tenanter"
+)
+
+var huaweiClientMutex sync.Mutex
+
+type HuaweiCci struct {
+	cli      *huaweicci.Clientset
+	region   tenanter.Region
+	tenanter tenanter.Tenanter
+}
+
+const (
+	apiVersion  = "client.authentication.k8s.io/v1beta1"
+	iamEndpoint = "https://iam.myhuaweicloud.com"
+)
+
+func newHuaweiCciClient(region tenanter.Region, tenant tenanter.Tenanter) (Poder, error) {
+	var (
+		client *huaweicci.Clientset
+		err    error
+	)
+	cciEndpoint := "https://cci." + region.GetName() + ".myhuaweicloud.com"
+	cciConfig, err := clientcmd.BuildConfigFromFlags(cciEndpoint, "")
+	if err != nil {
+		return nil, err
+	}
+
+	switch t := tenant.(type) {
+	case *tenanter.AccessKeyTenant:
+		// 阿里云的sdk有一个 map 的并发问题，go test 加上-race 能检测出来，所以这里加一个锁
+		huaweiClientMutex.Lock()
+		var optionArgs []string
+		optionArgs = append(optionArgs, fmt.Sprintf("--iam-endpoint=%s", iamEndpoint))
+		optionArgs = append(optionArgs, fmt.Sprintf("--project-name=%s", region.GetName()))
+		optionArgs = append(optionArgs, fmt.Sprintf("--ak=%s", t.GetId()))
+		optionArgs = append(optionArgs, fmt.Sprintf("--sk=%s", t.GetSecret()))
+		cciConfig.ExecProvider = &api.ExecConfig{
+			Command:    "cci-iam-authenticator",
+			APIVersion: apiVersion,
+			Args:       append([]string{"token"}, optionArgs...),
+			Env:        make([]api.ExecEnvVar, 0),
+		}
+		client, err = huaweicci.NewForConfig(cciConfig)
+		huaweiClientMutex.Unlock()
+	default:
+	}
+
+	if err != nil {
+		return nil, errors.Wrap(err, "init huawei pod client error")
+	}
+
+	return &HuaweiCci{
+		cli:      client,
+		region:   region,
+		tenanter: tenant,
+	}, nil
+}
+
+func (pod *HuaweiCci) ListPodDetail(ctx context.Context, req *pbpod.ListPodDetailReq) (*pbpod.ListPodDetailResp, error) {
+	resp, err := pod.cli.CoreV1().Pods(req.GetNamespace()).List(metav1.ListOptions{})
+	if err != nil {
+		return nil, errors.Wrap(err, "Huaweiyun ListDetail pod error")
+	}
+	glog.Info("Huaweiyun ListDetail pod success", resp.Items)
+	var podes = make([]*pbpod.PodInstance, len(resp.Items))
+	for k, v := range resp.Items {
+		podes[k] = &pbpod.PodInstance{
+			Provider:       pbtenant.CloudProvider_huawei,
+			AccountName:    pod.tenanter.AccountName(),
+			PodId:          string(v.GetUID()),
+			PodName:        v.Name,
+			RegionId:       pod.region.GetId(),
+			ContainerImage: v.Spec.Containers[0].Image,
+			ContainerName:  v.Spec.Containers[0].Name,
+			CpuPod:         v.Spec.Containers[0].Resources.Requests.Cpu().String(),
+			MemoryPod:      v.Spec.Containers[0].Resources.Requests.Memory().String(),
+			Namespace:      v.Namespace,
+		}
+	}
+
+	isFinished := false
+	if len(podes) < int(req.PageSize) {
+		isFinished = true
+	}
+
+	return &pbpod.ListPodDetailResp{
+		Pods:       podes,
+		Finished:   isFinished,
+		PageNumber: req.PageNumber + 1,
+		PageSize:   req.PageSize,
+		//NextToken:  resp.NextToken,
+		//RequestId: resp.RequestId,
+	}, nil
+}
+
+func (pod *HuaweiCci) CreatePod(ctx context.Context, req *pbpod.CreatePodReq) (*pbpod.CreatePodResp, error) {
+	//resp, err := pod.cli.CoreV1().Pods(req.GetNamespace()).List(metav1.ListOptions{})
+	//if err != nil {
+	//	return nil, errors.Wrap(err, "Huaweiyun ListDetail pod error")
+	//}
+	//glog.Info("Huaweiyun ListDetail pod success", resp.Items)
+	//var podes = make([]*pbpod.PodInstance, len(resp.Items))
+	//for k, v := range resp.Items {
+	//	podes[k] = &pbpod.PodInstance{
+	//		Provider:     pbtenant.CloudProvider_huawei,
+	//		AccountName:  pod.tenanter.AccountName(),
+	//		InstanceId:   string(v.GetUID()),
+	//		InstanceName: v.Name,
+	//		RegionName:   pod.region.GetName(),
+	//		PublicIps:    v.Status.PodIP,
+	//		//InstanceType: v.InstanceType,
+	//		//Cpu:    v.Spec.Containers[0].Resources.Requests.Cpu(),
+	//		//Memory: v.Spec.Containers[0].Resources.Requests.Memory(),
+	//		//Description:     v.Description,
+	//		Status:       string(v.Status.Phase),
+	//		CreationTime: v.CreationTimestamp.String(),
+	//		//ExpireTime:   v.ExpiredTime,
+	//		//InnerIps:        v.IntranetIp,
+	//		//VpcId: v.VpcId,
+	//		//SecurityGroupId: v.SecurityGroupId
+	//	}
+	//}
+	//
+	//isFinished := false
+	//if len(podes) < int(req.PageSize) {
+	//	isFinished = true
+	//}
+	//
+	return &pbpod.CreatePodResp{
+		Pods: nil,
+		//Finished:  isFinished,
+		//RequestId: resp.RequestId,
+	}, nil
+
+}

adaptor/pod_adaptor/service/poder/poder.go

@@ -2,6 +2,7 @@ package poder
 
 import (
 	"context"
+
 	"gitlink.org.cn/JCCE/PCM/common/tenanter"
 	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbpod"
 	"gitlink.org.cn/JCCE/PCM/lan_trans/idl/pbtenant"
@@ -35,7 +36,7 @@ func NewPodClient(provider pbtenant.CloudProvider, region tenanter.Region, tenan
 	case pbtenant.CloudProvider_tencent:
 		return nil, nil
 	case pbtenant.CloudProvider_huawei:
-		return nil, nil
+		return newHuaweiCciClient(region, tenant)
 		//TODO aws
 		//case pbtenant.CloudProvider_aws:
 		//	return newAwsPodClient(region, tenant)

gen.sh

@@ -1,5 +1,5 @@
 #！/bin/bash
 
-rm -rf lan_trans/gen/*
+rm -rf lan_trans/idl/*
 buf mod update
 buf generate

go.mod

@@ -3,7 +3,6 @@ module gitlink.org.cn/JCCE/PCM
 go 1.17
 
 require (
-	github.com/Unknwon/goconfig v1.0.0
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1530
 	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/golang/glog v1.0.0
@@ -12,30 +11,24 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.377
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.377
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.371
 	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e
 	google.golang.org/grpc v1.45.0
 	google.golang.org/protobuf v1.28.0
-	k8s.io/api v0.0.0-20190620084959-7cf5895f2711
-	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
 	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550 // indirect
 	github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gofuzz v1.0.0 // indirect
 	github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
 	github.com/imdario/mergo v0.3.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/smartystreets/goconvey v1.7.2 // indirect
 	github.com/spf13/pflag v1.0.1 // indirect
 	golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
@@ -49,8 +42,9 @@ require (
 	gopkg.in/inf.v0 v0.9.0 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/api v0.0.0-20190620084959-7cf5895f2711 // indirect
+	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719 // indirect
 	k8s.io/klog v0.3.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 // indirect
 	k8s.io/utils v0.0.0-20190221042446-c2654d5206da // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )

idl/pbpod/pod.proto

@@ -22,9 +22,9 @@ message PodInstance {
   // 容器名称
   string container_name = 7;
   // vcpu数
-  float cpu_pod = 8;
+  string cpu_pod = 8;
   // 内存MB
-  float memory_pod = 9;
+  string memory_pod = 9;
 
   //安全组ID                  对应腾讯 SecurityGroupIds(腾讯必需)
   string security_group_id = 10;
@@ -34,7 +34,6 @@ message PodInstance {
   string vpc_id = 12;
   //名空间
   string namespace = 13;
-
 }
 
 
@@ -92,6 +91,8 @@ message ListPodDetailReq {
   int32 page_size = 6;
   // 分页相关参数，下一页的token
   string next_token = 7;
+  // namespace
+  string namespace = 8;
 }
 
 message ListPodDetailResp {

lan_trans/idl/demo/demo.pb.gw.go

@@ -77,13 +77,12 @@ func RegisterDemoServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/demo.DemoService/Echo", runtime.WithHTTPPathPattern("/apis/demo"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/demo.DemoService/Echo")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_DemoService_Echo_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_DemoService_Echo_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -140,13 +139,12 @@ func RegisterDemoServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/demo.DemoService/Echo", runtime.WithHTTPPathPattern("/apis/demo"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/demo.DemoService/Echo")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_DemoService_Echo_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_DemoService_Echo_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)

lan_trans/idl/pbecs/ecs.pb.gw.go

@@ -145,13 +145,12 @@ func RegisterEcsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbecs.EcsService/ListEcsDetail", runtime.WithHTTPPathPattern("/apis/ecs/detail"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbecs.EcsService/ListEcsDetail")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_EcsService_ListEcsDetail_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_EcsService_ListEcsDetail_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -169,13 +168,12 @@ func RegisterEcsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbecs.EcsService/ListEcs", runtime.WithHTTPPathPattern("/apis/ecs"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbecs.EcsService/ListEcs")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_EcsService_ListEcs_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_EcsService_ListEcs_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -193,13 +191,12 @@ func RegisterEcsServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbecs.EcsService/ListEcsAll", runtime.WithHTTPPathPattern("/apis/ecs/all"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbecs.EcsService/ListEcsAll")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_EcsService_ListEcsAll_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_EcsService_ListEcsAll_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -256,13 +253,12 @@ func RegisterEcsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbecs.EcsService/ListEcsDetail", runtime.WithHTTPPathPattern("/apis/ecs/detail"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbecs.EcsService/ListEcsDetail")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_EcsService_ListEcsDetail_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_EcsService_ListEcsDetail_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -277,13 +273,12 @@ func RegisterEcsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbecs.EcsService/ListEcs", runtime.WithHTTPPathPattern("/apis/ecs"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbecs.EcsService/ListEcs")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_EcsService_ListEcs_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_EcsService_ListEcs_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -298,13 +293,12 @@ func RegisterEcsServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbecs.EcsService/ListEcsAll", runtime.WithHTTPPathPattern("/apis/ecs/all"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbecs.EcsService/ListEcsAll")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_EcsService_ListEcsAll_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_EcsService_ListEcsAll_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)

lan_trans/idl/pbpod/pod.pb.go

@@ -42,9 +42,9 @@ type PodInstance struct {
 	// 容器名称
 	ContainerName string `protobuf:"bytes,7,opt,name=container_name,json=containerName,proto3" json:"container_name,omitempty"`
 	// vcpu数
-	CpuPod float32 `protobuf:"fixed32,8,opt,name=cpu_pod,json=cpuPod,proto3" json:"cpu_pod,omitempty"`
+	CpuPod string `protobuf:"bytes,8,opt,name=cpu_pod,json=cpuPod,proto3" json:"cpu_pod,omitempty"`
 	// 内存MB
-	MemoryPod float32 `protobuf:"fixed32,9,opt,name=memory_pod,json=memoryPod,proto3" json:"memory_pod,omitempty"`
+	MemoryPod string `protobuf:"bytes,9,opt,name=memory_pod,json=memoryPod,proto3" json:"memory_pod,omitempty"`
 	//安全组ID                  对应腾讯 SecurityGroupIds(腾讯必需)
 	SecurityGroupId string `protobuf:"bytes,10,opt,name=security_group_id,json=securityGroupId,proto3" json:"security_group_id,omitempty"`
 	//子网ID                    对应腾讯 SubnetId(腾讯必需)
@@ -136,18 +136,18 @@ func (x *PodInstance) GetContainerName() string {
 	return ""
 }
 
-func (x *PodInstance) GetCpuPod() float32 {
+func (x *PodInstance) GetCpuPod() string {
 	if x != nil {
 		return x.CpuPod
 	}
-	return 0
+	return ""
 }
 
-func (x *PodInstance) GetMemoryPod() float32 {
+func (x *PodInstance) GetMemoryPod() string {
 	if x != nil {
 		return x.MemoryPod
 	}
-	return 0
+	return ""
 }
 
 func (x *PodInstance) GetSecurityGroupId() string {
@@ -419,6 +419,8 @@ type ListPodDetailReq struct {
 	PageSize int32 `protobuf:"varint,6,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	// 分页相关参数，下一页的token
 	NextToken string `protobuf:"bytes,7,opt,name=next_token,json=nextToken,proto3" json:"next_token,omitempty"`
+	// namespace
+	Namespace string `protobuf:"bytes,8,opt,name=namespace,proto3" json:"namespace,omitempty"`
 }
 
 func (x *ListPodDetailReq) Reset() {
@@ -502,6 +504,13 @@ func (x *ListPodDetailReq) GetNextToken() string {
 	return ""
 }
 
+func (x *ListPodDetailReq) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
 type ListPodDetailResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -754,9 +763,9 @@ var file_idl_pbpod_pod_proto_rawDesc = []byte{
 	0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
 	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63,
 	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07,
-	0x63, 0x70, 0x75, 0x5f, 0x70, 0x6f, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x02, 0x52, 0x06, 0x63,
+	0x63, 0x70, 0x75, 0x5f, 0x70, 0x6f, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63,
 	0x70, 0x75, 0x50, 0x6f, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f,
-	0x70, 0x6f, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x02, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72,
+	0x70, 0x6f, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x6f, 0x72,
 	0x79, 0x50, 0x6f, 0x64, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79,
 	0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x0f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
@@ -800,7 +809,7 @@ var file_idl_pbpod_pod_proto_rawDesc = []byte{
 	0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x66, 0x69, 0x6e,
 	0x69, 0x73, 0x68, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x49, 0x64, 0x22, 0xfb, 0x01, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64,
+	0x73, 0x74, 0x49, 0x64, 0x22, 0x99, 0x02, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64,
 	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x33, 0x0a, 0x08, 0x70, 0x72, 0x6f,
 	0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62,
 	0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x50, 0x72, 0x6f, 0x76,
@@ -816,54 +825,56 @@ var file_idl_pbpod_pod_proto_rawDesc = []byte{
 	0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53,
 	0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65,
 	0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x22, 0xd3, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x44, 0x65,
-	0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x70, 0x6f, 0x64, 0x73,
+	0x65, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x22, 0xd3, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x44, 0x65, 0x74, 0x61,
+	0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x70, 0x6f, 0x64, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x50, 0x6f, 0x64,
+	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x04, 0x70, 0x6f, 0x64, 0x73, 0x12, 0x1a,
+	0x0a, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61,
+	0x67, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x70, 0x61, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x70,
+	0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x65, 0x78, 0x74,
+	0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x65,
+	0x78, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x41, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f,
+	0x64, 0x52, 0x65, 0x71, 0x12, 0x33, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e,
+	0x74, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52,
+	0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x35, 0x0a, 0x0b, 0x4c, 0x69, 0x73,
+	0x74, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x70, 0x6f, 0x64, 0x73,
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x50,
 	0x6f, 0x64, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x04, 0x70, 0x6f, 0x64, 0x73,
-	0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x08, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x12, 0x1f, 0x0a, 0x0b,
-	0x70, 0x61, 0x67, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x0a,
-	0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x65,
-	0x78, 0x74, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x6e, 0x65, 0x78, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x41, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74,
-	0x50, 0x6f, 0x64, 0x52, 0x65, 0x71, 0x12, 0x33, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x74, 0x65, 0x6e,
-	0x61, 0x6e, 0x74, 0x2e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x35, 0x0a, 0x0b, 0x4c,
-	0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x04, 0x70, 0x6f,
-	0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64,
-	0x2e, 0x50, 0x6f, 0x64, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x04, 0x70, 0x6f,
-	0x64, 0x73, 0x22, 0x0f, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x41, 0x6c, 0x6c,
-	0x52, 0x65, 0x71, 0x32, 0xdc, 0x02, 0x0a, 0x0a, 0x50, 0x6f, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x64, 0x12,
-	0x13, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f,
-	0x64, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x15, 0x22, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x2f, 0x63, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x5f, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x50,
-	0x6f, 0x64, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65,
-	0x71, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f,
-	0x64, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x1b, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x15, 0x22, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x2f, 0x64,
-	0x65, 0x74, 0x61, 0x69, 0x6c, 0x3a, 0x01, 0x2a, 0x12, 0x46, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74,
-	0x50, 0x6f, 0x64, 0x12, 0x11, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x50, 0x6f, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x0e, 0x22, 0x09, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x3a, 0x01, 0x2a,
-	0x12, 0x50, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x41, 0x6c, 0x6c, 0x12, 0x14,
-	0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x41, 0x6c,
-	0x6c, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12,
-	0x22, 0x0d, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x2f, 0x61, 0x6c, 0x6c, 0x3a,
-	0x01, 0x2a, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x6f, 0x72,
-	0x67, 0x2e, 0x63, 0x6e, 0x2f, 0x4a, 0x43, 0x43, 0x45, 0x2f, 0x50, 0x43, 0x4d, 0x2f, 0x6c, 0x61,
-	0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x2f, 0x69, 0x64, 0x6c, 0x2f, 0x70, 0x62, 0x70, 0x6f,
-	0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x22, 0x0f, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65,
+	0x71, 0x32, 0xdc, 0x02, 0x0a, 0x0a, 0x50, 0x6f, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x12, 0x53, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x64, 0x12, 0x13, 0x2e,
+	0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x64, 0x52,
+	0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15,
+	0x22, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x2f, 0x63, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x5f, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64,
+	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a,
+	0x18, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x44,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02,
+	0x15, 0x22, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x2f, 0x64, 0x65, 0x74,
+	0x61, 0x69, 0x6c, 0x3a, 0x01, 0x2a, 0x12, 0x46, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f,
+	0x64, 0x12, 0x11, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f,
+	0x64, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x50, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e,
+	0x22, 0x09, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x3a, 0x01, 0x2a, 0x12, 0x50,
+	0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x41, 0x6c, 0x6c, 0x12, 0x14, 0x2e, 0x70,
+	0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x64, 0x41, 0x6c, 0x6c, 0x52,
+	0x65, 0x71, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50,
+	0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x22, 0x0d,
+	0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x70, 0x6f, 0x64, 0x2f, 0x61, 0x6c, 0x6c, 0x3a, 0x01, 0x2a,
+	0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2e,
+	0x63, 0x6e, 0x2f, 0x4a, 0x43, 0x43, 0x45, 0x2f, 0x50, 0x43, 0x4d, 0x2f, 0x6c, 0x61, 0x6e, 0x5f,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x2f, 0x69, 0x64, 0x6c, 0x2f, 0x70, 0x62, 0x70, 0x6f, 0x64, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

lan_trans/idl/pbpod/pod.pb.gw.go

@@ -179,13 +179,12 @@ func RegisterPodServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/CreatePod", runtime.WithHTTPPathPattern("/apis/pod/create"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/CreatePod")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PodService_CreatePod_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PodService_CreatePod_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -203,13 +202,12 @@ func RegisterPodServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/ListPodDetail", runtime.WithHTTPPathPattern("/apis/pod/detail"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/ListPodDetail")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PodService_ListPodDetail_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PodService_ListPodDetail_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -227,13 +225,12 @@ func RegisterPodServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/ListPod", runtime.WithHTTPPathPattern("/apis/pod"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/ListPod")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PodService_ListPod_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PodService_ListPod_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -251,13 +248,12 @@ func RegisterPodServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/ListPodAll", runtime.WithHTTPPathPattern("/apis/pod/all"))
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/pbpod.PodService/ListPodAll")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_PodService_ListPodAll_0(ctx, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_PodService_ListPodAll_0(rctx, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
@@ -314,13 +310,12 @@ func RegisterPodServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/CreatePod", runtime.WithHTTPPathPattern("/apis/pod/create"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/CreatePod")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PodService_CreatePod_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PodService_CreatePod_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -335,13 +330,12 @@ func RegisterPodServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/ListPodDetail", runtime.WithHTTPPathPattern("/apis/pod/detail"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/ListPodDetail")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PodService_ListPodDetail_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PodService_ListPodDetail_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -356,13 +350,12 @@ func RegisterPodServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/ListPod", runtime.WithHTTPPathPattern("/apis/pod"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/ListPod")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PodService_ListPod_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PodService_ListPod_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -377,13 +370,12 @@ func RegisterPodServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		ctx, err = runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/ListPodAll", runtime.WithHTTPPathPattern("/apis/pod/all"))
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/pbpod.PodService/ListPodAll")
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_PodService_ListPodAll_0(ctx, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_PodService_ListPodAll_0(rctx, inboundMarshaler, client, req, pathParams)
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)

lan_trans/openapiv2/idl/demo/demo.swagger.json

@@ -68,11 +68,14 @@
     "protobufAny": {
       "type": "object",
       "properties": {
-        "@type": {
+        "typeUrl": {
           "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "format": "byte"
         }
-      },
-      "additionalProperties": {}
+      }
     },
     "rpcStatus": {
       "type": "object",

lan_trans/openapiv2/idl/pbecs/ecs.swagger.json

@@ -186,7 +186,7 @@
         },
         "vpcId": {
           "type": "string",
-          "title": "vcp id"
+          "title": "vpc id"
         },
         "resourceGroupId": {
           "type": "string",
@@ -303,11 +303,14 @@
     "protobufAny": {
       "type": "object",
       "properties": {
-        "@type": {
+        "typeUrl": {
           "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "format": "byte"
         }
-      },
-      "additionalProperties": {}
+      }
     },
     "rpcStatus": {
       "type": "object",

lan_trans/openapiv2/idl/pbpod/pod.swagger.json

@@ -267,6 +267,10 @@
         "nextToken": {
           "type": "string",
           "title": "分页相关参数，下一页的token"
+        },
+        "namespace": {
+          "type": "string",
+          "title": "namespace"
         }
       }
     },
@@ -358,13 +362,11 @@
           "title": "容器名称"
         },
         "cpuPod": {
-          "type": "number",
-          "format": "float",
+          "type": "string",
           "title": "vcpu数"
         },
         "memoryPod": {
-          "type": "number",
-          "format": "float",
+          "type": "string",
           "title": "内存MB"
         },
         "securityGroupId": {
@@ -400,11 +402,14 @@
     "protobufAny": {
       "type": "object",
       "properties": {
-        "@type": {
+        "typeUrl": {
           "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "format": "byte"
         }
-      },
-      "additionalProperties": {}
+      }
     },
     "rpcStatus": {
       "type": "object",

lan_trans/openapiv2/idl/pbtenant/tenant.swagger.json

@@ -15,11 +15,14 @@
     "protobufAny": {
       "type": "object",
       "properties": {
-        "@type": {
+        "typeUrl": {
           "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "format": "byte"
         }
-      },
-      "additionalProperties": {}
+      }
     },
     "rpcStatus": {
       "type": "object",