@daocloud-proto/skoala 0.5.1-28 → 0.5.1-34

package/api/general/v1alpha1/skoala.pb.ts

@@ -12,6 +12,12 @@ export enum ListNamespaceReqGatewayStatus {
   Unavailable = "Unavailable",
 }
 
+export enum ListServiceReqServiceType {
+  ALL = "ALL",
+  SESAME = "SESAME",
+  K8S = "K8S",
+}
+
 export type ListWorkspaceReq = {
   page?: number
   pageSize?: number
@@ -49,6 +55,30 @@ export type ListNamespaceReq = {
   pageSize?: number
 }
 
+export type ListServiceReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string[]
+  serviceType?: ListServiceReqServiceType
+  serviceName?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListServiceRes = {
+  items?: ListServiceInfo[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListServiceInfo = {
+  serviceName?: string
+  namespaceName?: string
+  labels?: {[key: string]: string}
+  createdAt?: string
+  sesameServiceName?: string
+  sesameNamespaceName?: string
+}
+
 export type ListNamespaceRes = {
   namespaceNames?: string[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination

package/api/hosted/v1alpha1/api.pb.ts

@@ -5,7 +5,6 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
-import * as SkoalaApiHostedV1alpha1Gatewayservice from "./gatewayservice.pb"
 import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
@@ -162,7 +161,7 @@ export type ServiceDetail = {
 
 type BaseAPIConfig = {
   apiName?: string
-  virtualhost?: Virtualhost
+  fqdn?: string
   matchRule?: MatchRule
   enabled?: boolean
 }
@@ -200,16 +199,15 @@ export type RouteAction = {
   routeService?: RouteService[]
 }
 
-
-type BaseRouteService = {
+export type RouteService = {
   protocol?: SkoalaApiHostedV1alpha1Http.Protocol
+  enableGrpc?: boolean
+  serviceName?: string
+  namespaceName?: string
   port?: number
   weight?: number
 }
 
-export type RouteService = BaseRouteService
-  & OneOf<{ kubernetesService: SkoalaApiHostedV1alpha1Gatewayservice.KubernetesService; registryService: SkoalaApiHostedV1alpha1Gatewayservice.RegistryService; externalService: SkoalaApiHostedV1alpha1Gatewayservice.ExternalService }>
-
 export type RedirectAction = {
   hostname?: string
   path?: string

package/api/hosted/v1alpha1/nacos.pb.ts

@@ -26,6 +26,7 @@ export type ListNacosReq = {
   workspaceId?: string
   clusterName?: string
   namespaceName?: string
+  nacosName?: string
   page?: number
   pageSize?: number
 }
@@ -120,8 +121,7 @@ export type NacosConfig = {
   type?: NacosConfigType
   version?: string
   replicas?: number
-  cpu?: string
-  memory?: string
+  resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   serviceType?: SkoalaApiGeneralV1alpha1Service.ServiceType
   nodePort?: string
   databaseEnabled?: boolean

package/api/skoala/v1alpha1/skoala.pb.ts

@@ -38,6 +38,9 @@ export class Skoala {
   static ListClusterNamespace(req: SkoalaApiGeneralV1alpha1Skoala.ListNamespaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListNamespaceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListNamespaceReq, SkoalaApiGeneralV1alpha1Skoala.ListNamespaceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
   }
+  static ListClusterNamespaceService(req: SkoalaApiGeneralV1alpha1Skoala.ListServiceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListServiceRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListServiceReq, SkoalaApiGeneralV1alpha1Skoala.ListServiceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/services?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
+  }
   static ListWorkspace(req: SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceReq, SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRes>(`/apis/skoala.io/v1alpha1/workspaces?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.5.1-28",
+  "version": "0.5.1-34",
   "description": "",
   "main": "index.js",
   "scripts": {