@daocloud-proto/skoala 0.3.3-71 → 0.3.3-77

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

@@ -40,8 +40,8 @@ export type Gateway = {
   updatedAt?: string
   status?: SkoalaApiGeneralV1alpha1Skoala.Status
   endpoints?: string[]
-  master?: Node
-  worker?: Node
+  contour?: Node
+  envoy?: Node
   config?: GatewayConfig
 }
 
@@ -83,6 +83,70 @@ export type GetGatewayRes = {
   gateways?: Gateway
 }
 
+export type EnvoyPortsString = {
+  http?: string
+  https?: string
+}
+
+export type EnvoyPorts = {
+  http?: number
+  https?: number
+}
+
+export type ContourPorts = {
+  xds?: number
+  metrics?: number
+}
+
+export type ContourPortsString = {
+  xds?: string
+}
+
+export type HostIPs = {
+  http?: string
+  https?: string
+}
+
+export type EnvoyService = {
+  type?: string
+  ports?: EnvoyPorts
+  targetPorts?: EnvoyPortsString
+  nodePorts?: EnvoyPortsString
+  extraPorts?: string[]
+  externalTrafficPolicy?: string
+}
+
+export type ContourService = {
+  type?: string
+  clusterIp?: string
+  ports?: ContourPorts
+  nodePorts?: ContourPortsString
+  extraPorts?: string[]
+  externalTrafficPolicy?: string
+  loadBalancerSourceRanges?: string[]
+  loadBalancerIp?: string
+}
+
+export type EnvoyNormalConfig = {
+  kind?: string
+  replicas?: number
+  hostNetwork?: boolean
+  dnsPolicy?: string
+  useHostIp?: boolean
+  useHostPort?: boolean
+  containerPorts?: EnvoyPorts
+  hostIps?: HostIPs
+  hostPorts?: EnvoyPorts
+  service?: EnvoyService
+}
+
+export type ContourNormalConfig = {
+  rootNamespaces?: string
+  replicas?: number
+  containerPorts?: ContourPorts
+  service?: ContourService
+}
+
 export type CreateGatewayReq = {
   workspaceId?: number
   name?: string
@@ -92,10 +156,6 @@ export type CreateGatewayReq = {
   config?: GatewayConfig
 }
 
-export type CreateGatewayRes = {
-  gateway?: Gateway
-}
-
 export type UpdateGatewayReq = {
   workspaceId?: number
   gatewayName?: string
@@ -104,10 +164,6 @@ export type UpdateGatewayReq = {
   config?: GatewayConfig
 }
 
-export type UpdateGatewayRes = {
-  gateway?: Gateway
-}
-
 export type DeleteGatewayReq = {
   workspaceId?: number
   clusterName?: string
@@ -119,73 +175,56 @@ export type DeleteGatewayRes = {
   gateway?: Gateway
 }
 
+export type NormalConfig = {
+  contour?: ContourNormalConfig
+  envoy?: EnvoyNormalConfig
+}
+
 export type GatewayConfig = {
   normal?: NormalConfig
   advanced?: AdvancedConfig
 }
 
 
-type BaseNormalConfig = {
-  masterCount?: number
-  workerCount?: number
-}
-
-export type NormalConfig = BaseNormalConfig
-  & OneOf<{ clusterIp: ClusterIP; nodePort: NodePort; loadBalancer: LoadBalancer; externalName: ExternalName }>
-
-export type Port = {
-  name?: string
-  protocol?: string
-  port?: number
-  targetPort?: number
-  nodePort?: number
-}
-
-export type NodePort = {
-  ports?: Port[]
+type BaseContourAdvancedConfig = {
+  resources?: Resource
 }
 
-export type ClusterIP = {
-  ports?: Port[]
-}
+export type ContourAdvancedConfig = BaseContourAdvancedConfig
+  & OneOf<{ rollingUpdate: RollingUpdate; recreate: string }>
 
-export type LoadBalancer = {
-}
 
-export type ExternalName = {
-  externalName?: string
+type BaseEnvoyAdvancedConfig = {
+  resources?: Resource
 }
 
+export type EnvoyAdvancedConfig = BaseEnvoyAdvancedConfig
+  & OneOf<{ rollingUpdate: RollingUpdate; recreate: string }>
 
-type BaseAdvancedConfig = {
+export type AdvancedConfig = {
   log?: Log
-  resource?: Resource
-  enableGlobalRateLimit?: boolean
+  contour?: ContourAdvancedConfig
+  envoy?: EnvoyAdvancedConfig
+  globalRateLimit?: boolean
 }
 
-export type AdvancedConfig = BaseAdvancedConfig
-  & OneOf<{ rollingUpdate: RollingUpdate; recreate: string }>
-
 export type Log = {
-  workerLogLevel?: LogLogLevel
-  podLogLevel?: number
-  enableDebugLog?: boolean
-  enableLogToInsight?: boolean
-}
-
-export type Quota = {
-  cpuRequests?: number
-  cpuLimits?: number
-  memoryRequests?: number
-  memoryLimits?: number
+  envoyLogLevel?: LogLogLevel
+  k8SDebug?: number
+  contourDebug?: boolean
+  logToInsight?: boolean
 }
 
 export type Resource = {
-  master?: Quota
-  worker?: Quota
+  cpuRequests?: string
+  cpuLimits?: string
+  memoryRequests?: string
+  memoryLimits?: string
 }
 
 export type RollingUpdate = {
+  maxSurge?: string
+  maxUnavailable?: string
 }
 
 export type GetImagesRes = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.3.3-71",
+  "version": "0.3.3-77",
   "description": "",
   "main": "index.js",
   "scripts": {