diff --git a/components/dashboard/ee/src/admin.tsx b/components/dashboard/ee/src/admin.tsx index 57e930b2f27139..109c2dd367e5ed 100644 --- a/components/dashboard/ee/src/admin.tsx +++ b/components/dashboard/ee/src/admin.tsx @@ -17,11 +17,12 @@ import { HashRouter } from "react-router-dom"; import { Link, Typography } from "@material-ui/core"; import { UserView, AdditionalUserPropertiesRenderer } from "./components/admin/user-view"; import { GitpodHostUrl } from "@gitpod/gitpod-protocol/lib/util/gitpod-host-url"; -import { WorkspaceView } from "./components/admin/workspace-view"; +import { WorkspaceView, AdditionalWorkspacePropertiesRenderer } from "./components/admin/workspace-view"; import { renderEntrypoint } from "../../src/entrypoint"; export interface AdminIndexProps { renderAdditionalUserProperties?: AdditionalUserPropertiesRenderer; + renderAdditionalWorkspaceProperties?: AdditionalWorkspacePropertiesRenderer; } export const AdminIndex: React.SFC = (_props: AdminIndexProps) => { @@ -48,7 +49,7 @@ export const AdminIndex: React.SFC = (_props: Admin } /> - } /> + } /> diff --git a/components/dashboard/ee/src/components/admin/workspace-view.tsx b/components/dashboard/ee/src/components/admin/workspace-view.tsx index d09e0f04e65a95..4f76b58a6cf321 100644 --- a/components/dashboard/ee/src/components/admin/workspace-view.tsx +++ b/components/dashboard/ee/src/components/admin/workspace-view.tsx @@ -20,7 +20,10 @@ import { ErrorCodes } from '@gitpod/gitpod-protocol/lib/messaging/error'; export interface WorkspaceViewProps { service: GitpodService; workspaceID: string; + + renderAdditionalWorkspaceProperties?: AdditionalWorkspacePropertiesRenderer; } +export type AdditionalWorkspacePropertiesRenderer = (service: GitpodService, workspace: WorkspaceAndInstance | undefined) => JSX.Element; interface WorkspaceViewState { workspace?: WorkspaceAndInstance; @@ -110,6 +113,9 @@ export class WorkspaceView extends React.Component{!!fields[f].render ? fields[f].render(workspace) : workspace[f]} {fields[f].actions && fields[f].actions(workspace)} ) } + { + this.props.renderAdditionalWorkspaceProperties && this.props.renderAdditionalWorkspaceProperties(this.props.service, workspace) + } } diff --git a/components/gitpod-protocol/src/workspace-instance.ts b/components/gitpod-protocol/src/workspace-instance.ts index 773cc3d3dce29f..af53ed3184184a 100644 --- a/components/gitpod-protocol/src/workspace-instance.ts +++ b/components/gitpod-protocol/src/workspace-instance.ts @@ -70,6 +70,12 @@ export interface WorkspaceInstanceStatus { // nodeName is the name of the node the instance was scheduled onto nodeName?: string; + // podName is the name of the pod of this instance + podName?: string; + + // nodeIp is the IP of the node the workspace is running on + nodeIp?: string; + // ownerToken is the token one needs to access the workspace. Its presence is checked by ws-proxy. ownerToken?: string; } diff --git a/components/ws-manager-api/core.proto b/components/ws-manager-api/core.proto index 04fdaeeb995b97..6c9196dd87e06e 100644 --- a/components/ws-manager-api/core.proto +++ b/components/ws-manager-api/core.proto @@ -368,6 +368,10 @@ message WorkspaceMetadata { message WorkspaceRuntimeInfo { // node_name is the name of the node the workspace runs on string node_name = 1; + // pod_name is the name of the pod the workspace runs in + string pod_name = 2; + // node_ip is the IP of the node the workspace runs on + string node_ip = 3; } // WorkspaceAuthentication contains authentication information used by ws-proxy to allow/deny access to diff --git a/components/ws-manager-api/go/core.pb.go b/components/ws-manager-api/go/core.pb.go index 760b423fb7d6fe..2e2f88704d7370 100644 --- a/components/ws-manager-api/go/core.pb.go +++ b/components/ws-manager-api/go/core.pb.go @@ -1,7 +1,3 @@ -// Copyright (c) 2021 Gitpod GmbH. All rights reserved. -// Licensed under the GNU Affero General Public License (AGPL). -// See License-AGPL.txt in the project root for license information. - // Code generated by protoc-gen-go. DO NOT EDIT. // source: core.proto @@ -1644,7 +1640,11 @@ func (m *WorkspaceMetadata) GetStartedAt() *timestamp.Timestamp { // should not be directly acted upon. type WorkspaceRuntimeInfo struct { // node_name is the name of the node the workspace runs on - NodeName string `protobuf:"bytes,1,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"` + NodeName string `protobuf:"bytes,1,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"` + // pod_name is the name of the pod the workspace runs in + PodName string `protobuf:"bytes,2,opt,name=pod_name,json=podName,proto3" json:"pod_name,omitempty"` + // node_ip is the IP of the node the workspace runs on + NodeIp string `protobuf:"bytes,3,opt,name=node_ip,json=nodeIp,proto3" json:"node_ip,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1682,6 +1682,20 @@ func (m *WorkspaceRuntimeInfo) GetNodeName() string { return "" } +func (m *WorkspaceRuntimeInfo) GetPodName() string { + if m != nil { + return m.PodName + } + return "" +} + +func (m *WorkspaceRuntimeInfo) GetNodeIp() string { + if m != nil { + return m.NodeIp + } + return "" +} + // WorkspaceAuthentication contains authentication information used by ws-proxy to allow/deny access to // workspaces and their ports. type WorkspaceAuthentication struct { @@ -2068,136 +2082,137 @@ func init() { } var fileDescriptor_f7e43720d1edc0fe = []byte{ - // 2054 bytes of a gzipped FileDescriptorProto + // 2079 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x6f, 0xdb, 0xc8, - 0x11, 0xb7, 0x3e, 0x2c, 0x4b, 0x63, 0x5b, 0xa6, 0xd7, 0x5f, 0x8a, 0x72, 0x77, 0x31, 0xd8, 0x0b, - 0x6a, 0x38, 0xb5, 0x7d, 0x70, 0x72, 0xc0, 0x25, 0x57, 0xe0, 0x4e, 0xb6, 0x69, 0x87, 0x17, 0x59, - 0x52, 0x57, 0x92, 0x73, 0xc9, 0x0b, 0xb1, 0x96, 0xd6, 0x32, 0x61, 0x8a, 0xcb, 0x92, 0x2b, 0x3b, - 0x2a, 0x50, 0xf4, 0xa1, 0xef, 0x05, 0x0a, 0xf4, 0xb9, 0xff, 0x5c, 0xff, 0x8a, 0x3e, 0x14, 0x28, - 0x76, 0xb9, 0xa4, 0xa8, 0xaf, 0x38, 0x0f, 0xf7, 0xc6, 0xd9, 0xf9, 0xcd, 0xec, 0xee, 0xec, 0xcc, - 0x6f, 0x67, 0x09, 0xd0, 0x61, 0x3e, 0x3d, 0xf4, 0x7c, 0xc6, 0x19, 0x5a, 0x7c, 0x08, 0xfa, 0xc4, - 0x2d, 0x3f, 0xef, 0x30, 0x97, 0x53, 0x97, 0x1f, 0x04, 0xd4, 0xbf, 0xb7, 0x3b, 0xf4, 0x80, 0x78, - 0xf6, 0x91, 0xed, 0xda, 0xdc, 0x26, 0x8e, 0xfd, 0x17, 0xea, 0x87, 0xe8, 0xf2, 0xb3, 0x1e, 0x63, - 0x3d, 0x87, 0x1e, 0x49, 0xe9, 0x7a, 0x70, 0x73, 0xc4, 0xed, 0x3e, 0x0d, 0x38, 0xe9, 0x7b, 0x21, - 0x40, 0xdf, 0x86, 0xcd, 0x0b, 0xca, 0xdf, 0x33, 0xff, 0x2e, 0xf0, 0x48, 0x87, 0x06, 0x98, 0xfe, - 0x79, 0x40, 0x03, 0xae, 0x5f, 0xc0, 0xd6, 0xc4, 0x78, 0xe0, 0x31, 0x37, 0xa0, 0xe8, 0x10, 0x72, - 0x01, 0x27, 0x7c, 0x10, 0x94, 0x52, 0xbb, 0x99, 0xbd, 0xe5, 0xe3, 0xed, 0x43, 0xb9, 0xa0, 0xc3, - 0x18, 0xda, 0x94, 0x5a, 0xac, 0x50, 0xfa, 0x7f, 0x52, 0xb0, 0xd5, 0xe4, 0xc4, 0x1f, 0xf9, 0x52, - 0x53, 0xa0, 0x22, 0xa4, 0xed, 0x6e, 0x29, 0xb5, 0x9b, 0xda, 0x2b, 0xe0, 0xb4, 0xdd, 0x45, 0xcf, - 0xa1, 0xa8, 0x36, 0x63, 0x79, 0x3e, 0xbd, 0xb1, 0x3f, 0x95, 0xd2, 0x52, 0xb7, 0xaa, 0x46, 0x1b, - 0x72, 0x10, 0xbd, 0x82, 0x7c, 0x9f, 0x72, 0xd2, 0x25, 0x9c, 0x94, 0x32, 0xbb, 0xa9, 0xbd, 0xe5, - 0xe3, 0xd2, 0xe4, 0x12, 0x2e, 0x95, 0x1e, 0xc7, 0x48, 0x74, 0x00, 0xd9, 0xc0, 0xa3, 0x9d, 0x52, - 0x56, 0x5a, 0x3c, 0x51, 0x16, 0xe3, 0x0b, 0x6b, 0x7a, 0xb4, 0x83, 0x25, 0x0c, 0xed, 0x41, 0x96, - 0x0f, 0x3d, 0x5a, 0xca, 0xed, 0xa6, 0xf6, 0x8a, 0xc7, 0x9b, 0x93, 0x13, 0xb4, 0x86, 0x1e, 0xc5, - 0x12, 0xf1, 0x4b, 0x36, 0xbf, 0xa8, 0xe5, 0xf4, 0x7d, 0xd8, 0x9e, 0xdc, 0xa4, 0x8a, 0x97, 0x06, - 0x99, 0x81, 0xef, 0xa8, 0x6d, 0x8a, 0x4f, 0xfd, 0x23, 0x6c, 0x36, 0x39, 0xf3, 0x1e, 0x8d, 0xc7, - 0x31, 0xe4, 0x3c, 0xe6, 0xd8, 0x9d, 0xa1, 0x8c, 0x43, 0xf1, 0xb8, 0x1c, 0x2f, 0x3a, 0x61, 0xdc, - 0x90, 0x08, 0xac, 0x90, 0xfa, 0x8e, 0x08, 0xf6, 0x98, 0xef, 0x70, 0x19, 0xfa, 0x3e, 0x94, 0xce, - 0x68, 0xd0, 0xf1, 0xed, 0x6b, 0xfa, 0xd8, 0xc4, 0x3a, 0x83, 0x27, 0x33, 0xb0, 0x33, 0xce, 0x3f, - 0xf5, 0xf8, 0xf9, 0x23, 0x1d, 0x56, 0x1c, 0x12, 0xf0, 0x4a, 0x87, 0xdb, 0xf7, 0x36, 0x1f, 0xaa, - 0x33, 0x1d, 0x1b, 0xd3, 0x11, 0x68, 0xcd, 0xc1, 0x75, 0x38, 0x63, 0x94, 0x80, 0xff, 0x4d, 0xc1, - 0x7a, 0x62, 0x50, 0xcd, 0xfe, 0xdd, 0x97, 0xcd, 0xfe, 0x76, 0x21, 0x9e, 0xff, 0x10, 0x32, 0x0e, - 0xeb, 0xc9, 0x69, 0x97, 0xe3, 0x10, 0xc6, 0xf0, 0x2a, 0xeb, 0x5d, 0xd2, 0x20, 0x20, 0x3d, 0xfa, - 0x76, 0x01, 0x0b, 0x20, 0xfa, 0x23, 0xe4, 0x6e, 0x29, 0xe9, 0x52, 0xbf, 0x94, 0x91, 0xf9, 0xfd, - 0x6d, 0x14, 0xf5, 0xc9, 0xb5, 0x1c, 0xbe, 0x95, 0x30, 0xc3, 0xe5, 0xfe, 0x10, 0x2b, 0x9b, 0xf2, - 0x6b, 0x58, 0x4e, 0x0c, 0x8b, 0xc3, 0xbf, 0xa3, 0xc3, 0xe8, 0xf0, 0xef, 0xe8, 0x10, 0x6d, 0xc2, - 0xe2, 0x3d, 0x71, 0x06, 0x54, 0xc5, 0x21, 0x14, 0xde, 0xa4, 0x7f, 0x48, 0x9d, 0x14, 0x60, 0xc9, - 0x23, 0x43, 0x87, 0x91, 0xae, 0xfe, 0x23, 0xac, 0x5f, 0x12, 0xff, 0x4e, 0xc6, 0x67, 0x6e, 0x7a, - 0x6c, 0x43, 0xae, 0xe3, 0xb0, 0x80, 0x76, 0xa5, 0xab, 0x3c, 0x56, 0x92, 0xbe, 0x09, 0x28, 0x69, - 0xac, 0xce, 0xff, 0x27, 0x58, 0x6f, 0x52, 0xde, 0xb2, 0xfb, 0x94, 0x0d, 0xf8, 0x3c, 0x97, 0x65, - 0xc8, 0x77, 0x07, 0x3e, 0xe1, 0x36, 0x73, 0xd5, 0xfa, 0x62, 0x59, 0xb8, 0x4d, 0x3a, 0x50, 0x6e, - 0x09, 0xa0, 0x53, 0xe6, 0x72, 0x9f, 0x39, 0x0d, 0xe6, 0xf3, 0xcf, 0x2c, 0x95, 0x7e, 0xf2, 0x58, - 0x40, 0xa3, 0xa5, 0x86, 0x12, 0xfa, 0x9d, 0x2a, 0xca, 0xb0, 0x8c, 0xd7, 0x54, 0xa4, 0x85, 0xa7, - 0x51, 0x29, 0xea, 0x5b, 0xb0, 0x31, 0x36, 0x85, 0x9a, 0xf9, 0x39, 0x6c, 0xb4, 0xc8, 0x1d, 0x6d, - 0xba, 0xc4, 0x0b, 0x6e, 0xd9, 0xbc, 0xa9, 0xf5, 0x3d, 0xd8, 0x1c, 0x87, 0xcd, 0x2d, 0xcb, 0x2b, - 0xd8, 0x51, 0xf3, 0x54, 0xba, 0x7d, 0x3b, 0x08, 0x6c, 0xe6, 0xce, 0xdb, 0xcf, 0x0b, 0x58, 0x74, - 0xe8, 0x3d, 0x75, 0x54, 0x61, 0x6e, 0xa9, 0x85, 0xc7, 0x76, 0x55, 0xa1, 0xc4, 0x21, 0x46, 0x2f, - 0x43, 0x69, 0xda, 0xaf, 0xda, 0xc4, 0xbf, 0x33, 0xb0, 0x36, 0x91, 0xba, 0x53, 0x93, 0x25, 0xf9, - 0x2e, 0xfd, 0xc5, 0x7c, 0xb7, 0x37, 0x16, 0xda, 0x29, 0x02, 0x4b, 0x50, 0xdd, 0x0b, 0x58, 0xf4, - 0x6e, 0x49, 0x40, 0x25, 0x35, 0x8e, 0x36, 0x33, 0x62, 0x18, 0xa1, 0xc4, 0x21, 0x06, 0xbd, 0x11, - 0x77, 0x91, 0xdb, 0xb5, 0x45, 0x4a, 0x04, 0xa5, 0xc5, 0xd9, 0x45, 0x75, 0x1a, 0x23, 0x70, 0x02, - 0x8d, 0x4a, 0xb0, 0xd4, 0x0f, 0x6b, 0x4d, 0xd2, 0x6a, 0x01, 0x47, 0xa2, 0x20, 0x67, 0x9f, 0x7a, - 0xac, 0xb4, 0xa4, 0xc8, 0x59, 0xdd, 0x6d, 0x8a, 0xf7, 0x0f, 0x2f, 0x6c, 0xae, 0x48, 0x45, 0xc2, - 0xd0, 0xf7, 0xb0, 0xe4, 0x0f, 0x5c, 0x71, 0x93, 0x95, 0xf2, 0xd2, 0xe2, 0xe9, 0xe4, 0x0a, 0x70, - 0xa8, 0x36, 0xdd, 0x1b, 0x86, 0x23, 0x2c, 0x3a, 0x86, 0x2c, 0x19, 0xf0, 0xdb, 0x52, 0x41, 0xda, - 0x7c, 0x33, 0x69, 0x53, 0x19, 0xf0, 0x5b, 0xea, 0x72, 0xbb, 0x23, 0xf3, 0x1d, 0x4b, 0xac, 0xfe, - 0xbf, 0x14, 0xac, 0x8e, 0x05, 0x0d, 0xfd, 0x1e, 0xd6, 0x1e, 0xa2, 0x01, 0xcb, 0xee, 0x8b, 0xdd, - 0x84, 0x67, 0x55, 0x8c, 0x87, 0x4d, 0x31, 0x8a, 0x9e, 0x42, 0xc1, 0xee, 0x46, 0x10, 0x55, 0x4d, - 0x76, 0x57, 0x29, 0xcb, 0x90, 0x17, 0x8c, 0xe1, 0xd0, 0x20, 0x90, 0x47, 0x94, 0xc7, 0xb1, 0x1c, - 0xa5, 0x66, 0x36, 0x4e, 0x4d, 0xf4, 0x0a, 0x56, 0xc3, 0x8a, 0xe9, 0x5a, 0x1e, 0xf3, 0xb9, 0x08, - 0x7c, 0x66, 0x56, 0xc1, 0xac, 0x28, 0x94, 0x18, 0x08, 0xbe, 0xfc, 0x0e, 0x13, 0x27, 0xc3, 0xc3, - 0xc2, 0x96, 0x47, 0x50, 0xc0, 0x91, 0xa8, 0xff, 0x0d, 0xf2, 0x91, 0x77, 0x84, 0x20, 0x2b, 0x66, - 0x97, 0xdb, 0x5d, 0xc5, 0xf2, 0x5b, 0x54, 0x36, 0x27, 0x7e, 0x8f, 0x72, 0xb9, 0xc3, 0x55, 0xac, - 0x24, 0xf4, 0x3d, 0xc0, 0xbd, 0x1d, 0xd8, 0xd7, 0xb6, 0x23, 0x38, 0x3f, 0x33, 0x96, 0x59, 0xc2, - 0xe1, 0x55, 0xac, 0xc4, 0x09, 0xe0, 0xf4, 0xd6, 0xf5, 0x7f, 0x65, 0x61, 0x63, 0x46, 0x62, 0x89, - 0x89, 0x6f, 0x88, 0xed, 0xd0, 0xa8, 0x52, 0x94, 0x94, 0xdc, 0x4a, 0x7a, 0x6c, 0x2b, 0xe8, 0x0c, - 0x8a, 0xde, 0xc0, 0x71, 0x6c, 0xb7, 0x17, 0x9e, 0x49, 0xa0, 0x96, 0xf5, 0xf5, 0xdc, 0xf4, 0x3d, - 0x61, 0xcc, 0xc1, 0xab, 0xca, 0x48, 0x9e, 0x5b, 0x20, 0xbc, 0x44, 0x4d, 0x0a, 0xfd, 0x64, 0x07, - 0x3c, 0x50, 0x65, 0xf3, 0x98, 0x17, 0x65, 0x64, 0x48, 0x1b, 0x71, 0xfc, 0x81, 0x62, 0x24, 0x59, - 0x44, 0x05, 0x1c, 0xcb, 0xe8, 0x4f, 0xb0, 0x75, 0x63, 0xbb, 0xc4, 0xb1, 0xae, 0x49, 0xe7, 0x6e, - 0xe0, 0x59, 0x1d, 0xd6, 0xf7, 0x1c, 0xca, 0xa3, 0x73, 0x7c, 0x64, 0xa2, 0x0d, 0x69, 0x7b, 0x22, - 0x4d, 0x4f, 0x95, 0x25, 0x7a, 0x0d, 0xf9, 0x2e, 0xf5, 0x1c, 0x36, 0xa4, 0x5d, 0x79, 0xc0, 0x8f, - 0x7a, 0x89, 0xe1, 0xc8, 0x84, 0x75, 0x97, 0x72, 0x91, 0xda, 0x96, 0xcb, 0xb8, 0xe5, 0x53, 0xd2, - 0x1d, 0xca, 0xaa, 0x7b, 0xd4, 0xc7, 0x9a, 0xb2, 0xab, 0x09, 0xd6, 0x25, 0xdd, 0x21, 0xfa, 0x05, - 0x36, 0x6e, 0x6c, 0x3f, 0xe0, 0xd6, 0x20, 0xa0, 0xbe, 0x45, 0xa2, 0x86, 0xa0, 0xa0, 0x48, 0x24, - 0xec, 0x54, 0x0f, 0xa3, 0x4e, 0xf5, 0xb0, 0x15, 0x75, 0xaa, 0x78, 0x5d, 0x9a, 0xb5, 0x03, 0xea, - 0xc7, 0x1d, 0xc3, 0x5f, 0x61, 0x7d, 0x8a, 0xfd, 0xc4, 0xdd, 0xca, 0x1e, 0x5c, 0xea, 0xab, 0x94, - 0x08, 0x05, 0xb4, 0x23, 0x68, 0x87, 0x13, 0xcb, 0xee, 0xaa, 0x8c, 0xc8, 0x09, 0xd1, 0xec, 0xa2, - 0xd7, 0x00, 0x81, 0xe8, 0xd9, 0x68, 0xd7, 0x22, 0x5c, 0x11, 0xe5, 0xe7, 0x96, 0x51, 0x50, 0xe8, - 0x0a, 0xd7, 0x5f, 0xc2, 0xe6, 0x2c, 0xae, 0x11, 0x35, 0xef, 0xb2, 0x2e, 0xb5, 0x5c, 0xd2, 0x8f, - 0x68, 0x21, 0x2f, 0x06, 0x6a, 0xa4, 0x4f, 0x75, 0x06, 0x3b, 0x73, 0xc8, 0x06, 0xbd, 0x84, 0x02, - 0x89, 0x2e, 0x07, 0x69, 0x37, 0xf7, 0x52, 0x19, 0xe1, 0xd0, 0x33, 0x58, 0x96, 0x3b, 0xb4, 0x38, - 0xbb, 0xa3, 0xd1, 0x85, 0x0d, 0x72, 0xa8, 0x25, 0x46, 0xf4, 0x7f, 0x64, 0x01, 0x4d, 0x77, 0xb8, - 0xbf, 0x11, 0x83, 0xfd, 0x0c, 0xab, 0x37, 0x94, 0xf0, 0x81, 0x4f, 0xad, 0x1b, 0x87, 0xf4, 0x02, - 0xd9, 0x2e, 0x15, 0xa7, 0xa9, 0xf8, 0x3c, 0x04, 0x9d, 0x3b, 0xa4, 0x87, 0x57, 0x6e, 0x46, 0x42, - 0x80, 0xce, 0x61, 0x39, 0xf1, 0x60, 0x51, 0x9d, 0xf9, 0xb7, 0x93, 0xe4, 0x1f, 0x3b, 0x32, 0x47, - 0x58, 0x9c, 0x34, 0x44, 0xcf, 0x61, 0xf1, 0xb3, 0xac, 0x18, 0x6a, 0xd1, 0x2b, 0x58, 0xa2, 0xee, - 0xfd, 0x3d, 0xf1, 0x83, 0x52, 0x4e, 0x02, 0xa3, 0x7b, 0xcb, 0x70, 0xef, 0x6d, 0x9f, 0xb9, 0x7d, - 0xea, 0xf2, 0x2b, 0xe2, 0xdb, 0xe4, 0xda, 0xa1, 0x38, 0x82, 0xa2, 0x17, 0xb0, 0xde, 0xb9, 0xa5, - 0x9d, 0x3b, 0x36, 0xe0, 0x96, 0xc3, 0xc2, 0xe3, 0x52, 0x24, 0xa9, 0x45, 0x8a, 0xaa, 0x1a, 0x47, - 0x07, 0x80, 0x46, 0x91, 0x8d, 0xd1, 0x79, 0x89, 0x5e, 0x7f, 0x18, 0xf5, 0x9c, 0x0a, 0xbe, 0x0b, - 0x99, 0x9e, 0xcd, 0x55, 0x01, 0x14, 0xd5, 0x6a, 0xc4, 0x65, 0x27, 0x56, 0x2d, 0x54, 0x49, 0x36, - 0x83, 0x71, 0x36, 0x1b, 0xcb, 0x98, 0xe5, 0x2f, 0xcb, 0x18, 0xfd, 0x47, 0x58, 0x52, 0xee, 0x05, - 0x03, 0x89, 0x32, 0x4c, 0x26, 0x6a, 0x24, 0x8b, 0x3a, 0xa2, 0x7d, 0x62, 0x3b, 0x51, 0x8f, 0x2a, - 0x05, 0xfd, 0x27, 0xd8, 0x98, 0x11, 0x29, 0x71, 0x2b, 0x24, 0x9c, 0x64, 0x23, 0x07, 0xd3, 0x4d, - 0xae, 0x3e, 0x48, 0x30, 0xf9, 0xa8, 0xef, 0xfe, 0x8d, 0xfa, 0x9d, 0x44, 0x73, 0x91, 0x1d, 0x6b, - 0x2e, 0xf6, 0x5f, 0xc1, 0xc6, 0x8c, 0x17, 0x13, 0x5a, 0x81, 0x7c, 0xad, 0x8e, 0x2f, 0x2b, 0xd5, - 0xea, 0x07, 0x6d, 0x01, 0xad, 0xc1, 0xb2, 0x79, 0x79, 0x69, 0x9c, 0x99, 0x95, 0x96, 0x51, 0xfd, - 0xa0, 0xa5, 0xf6, 0xdf, 0x40, 0x71, 0x3c, 0x8e, 0x68, 0x13, 0xb4, 0xca, 0xd9, 0xa5, 0xd9, 0xb2, - 0xea, 0xef, 0x6b, 0x06, 0xb6, 0xea, 0x35, 0x69, 0x88, 0xa0, 0x18, 0x8e, 0x1a, 0x57, 0x06, 0xfe, - 0x50, 0xaf, 0x19, 0x5a, 0x6a, 0xdf, 0x84, 0xe2, 0xf8, 0x1d, 0x87, 0x9e, 0xc2, 0x4e, 0xa3, 0x8e, - 0x5b, 0xd6, 0x95, 0xd9, 0x34, 0x4f, 0xcc, 0xaa, 0xd9, 0xfa, 0x60, 0x35, 0xb0, 0x79, 0x55, 0x69, - 0x19, 0xda, 0x02, 0x2a, 0xc3, 0xf6, 0x94, 0xb2, 0x7d, 0x52, 0x35, 0x4f, 0xb5, 0xd4, 0xfe, 0x0f, - 0xb0, 0x3d, 0x9b, 0x5e, 0x51, 0x01, 0x16, 0xcf, 0x2b, 0xd5, 0xa6, 0x70, 0x90, 0x87, 0x6c, 0x0b, - 0xb7, 0x0d, 0x2d, 0x25, 0x06, 0x8d, 0xcb, 0x46, 0xeb, 0x83, 0x96, 0xde, 0xff, 0x7b, 0x0a, 0x8a, - 0xe3, 0x3d, 0x1c, 0x5a, 0x86, 0xa5, 0x76, 0xed, 0x5d, 0xad, 0xfe, 0xbe, 0xa6, 0x2d, 0x08, 0xa1, - 0x61, 0xd4, 0xce, 0xcc, 0xda, 0x85, 0x96, 0x12, 0xc1, 0x38, 0xc5, 0x46, 0xa5, 0x25, 0xa4, 0x34, - 0xd2, 0x60, 0xc5, 0xac, 0x99, 0x2d, 0xb3, 0x52, 0x35, 0x3f, 0x8a, 0x91, 0x8c, 0x00, 0xe3, 0x76, - 0xad, 0x26, 0x84, 0xac, 0x8c, 0x55, 0xad, 0x65, 0x60, 0xdc, 0x6e, 0xb4, 0x8c, 0x33, 0x6d, 0x49, - 0x58, 0x37, 0x5b, 0xf5, 0x46, 0x43, 0xa8, 0x17, 0x05, 0x56, 0x4a, 0xc6, 0x99, 0x96, 0xdb, 0xbf, - 0x4f, 0x10, 0x65, 0x82, 0x09, 0xc4, 0x92, 0x6b, 0xf5, 0x7a, 0x43, 0x5b, 0x40, 0x4f, 0x60, 0xeb, - 0xbc, 0x5d, 0xad, 0x5a, 0xef, 0xeb, 0xf8, 0x5d, 0xb3, 0x51, 0x39, 0x35, 0xac, 0x93, 0xca, 0xe9, - 0xbb, 0x76, 0x43, 0xcb, 0xa2, 0x0d, 0x58, 0x3b, 0x37, 0x7f, 0x35, 0xce, 0x2c, 0x6c, 0x34, 0xeb, - 0x6d, 0x7c, 0x6a, 0x34, 0xb5, 0x45, 0x11, 0xf0, 0x76, 0xd3, 0xc0, 0x56, 0xad, 0x72, 0x69, 0x48, - 0xbc, 0x96, 0xd3, 0xb3, 0xf9, 0x94, 0x96, 0xd2, 0xb3, 0xf9, 0xb4, 0x96, 0xd6, 0xb3, 0xf9, 0x8c, - 0x96, 0xd9, 0xff, 0x39, 0xd1, 0xb6, 0x89, 0x46, 0x47, 0xee, 0xc0, 0xb8, 0x68, 0x57, 0x2b, 0x58, - 0x5b, 0x10, 0x0b, 0x6e, 0x60, 0xe3, 0xa4, 0x6d, 0x56, 0xcf, 0xc2, 0xa0, 0x35, 0x70, 0xfd, 0xc4, - 0xd0, 0xd2, 0xe2, 0xf3, 0xe2, 0x6d, 0xbd, 0xd9, 0xd2, 0x32, 0xc7, 0xff, 0xcc, 0x81, 0x36, 0x4a, - 0x38, 0xe2, 0x92, 0x1e, 0xf5, 0x51, 0x15, 0x56, 0xc7, 0xfe, 0x8a, 0xa0, 0x88, 0xee, 0x66, 0xfd, - 0x43, 0x29, 0x7f, 0x35, 0x5b, 0xa9, 0x7a, 0xff, 0x05, 0x54, 0x87, 0xe2, 0x38, 0x3d, 0xa3, 0xaf, - 0x66, 0xfe, 0x97, 0x88, 0xfc, 0x7d, 0x3d, 0x47, 0x1b, 0x3b, 0xac, 0xc2, 0xea, 0x58, 0xaa, 0xc7, - 0xcb, 0x9b, 0xf5, 0xbf, 0xa1, 0xfc, 0xd5, 0x6c, 0x65, 0xec, 0xed, 0x57, 0x58, 0x9f, 0xfa, 0x0d, - 0x80, 0x9e, 0x29, 0xa3, 0x79, 0x3f, 0x13, 0xca, 0xbb, 0xf3, 0x01, 0xb1, 0xe7, 0x13, 0x28, 0xc4, - 0xcf, 0x69, 0xb4, 0x33, 0xfd, 0xc0, 0x0e, 0x3d, 0x95, 0xe6, 0xbd, 0xbc, 0xf5, 0x85, 0xef, 0x52, - 0xe8, 0x14, 0x60, 0xf4, 0xcc, 0x45, 0x11, 0x76, 0xea, 0xd9, 0x5c, 0x7e, 0x32, 0x43, 0x13, 0x2f, - 0xe4, 0x14, 0x60, 0xf4, 0xa8, 0x8d, 0x9d, 0x4c, 0x3d, 0x94, 0x63, 0x27, 0x33, 0x5e, 0xc0, 0x0b, - 0xe2, 0x1e, 0x4b, 0x3c, 0x50, 0x51, 0x84, 0x9d, 0x7e, 0x17, 0x97, 0xcb, 0xb3, 0x54, 0xb1, 0x1f, - 0x13, 0x56, 0x92, 0x4f, 0x55, 0x14, 0xa1, 0x67, 0x3c, 0x73, 0xcb, 0x4f, 0x67, 0xea, 0x62, 0x57, - 0x6d, 0xd0, 0x26, 0xdf, 0x9c, 0xe8, 0x9b, 0xf1, 0xc9, 0x27, 0x1f, 0xb9, 0xe5, 0x67, 0x73, 0xf5, - 0x91, 0xdb, 0x93, 0x3f, 0x7c, 0xdc, 0xef, 0xd9, 0xfc, 0x76, 0x70, 0x7d, 0xd8, 0x61, 0xfd, 0xa3, - 0x9e, 0xcd, 0x3d, 0xd6, 0x3d, 0xb0, 0x99, 0xfa, 0x3a, 0x7a, 0x08, 0x0e, 0xfa, 0x61, 0xa1, 0x1c, - 0x11, 0xcf, 0xbe, 0xce, 0xc9, 0x1e, 0xea, 0xe5, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x5d, - 0x35, 0x8b, 0xbe, 0x14, 0x00, 0x00, + 0x11, 0xb7, 0x2c, 0x59, 0x96, 0xc6, 0xb6, 0x4c, 0xaf, 0xbf, 0x14, 0xe5, 0xee, 0x62, 0xb0, 0x17, + 0xd4, 0xf0, 0xd5, 0xf6, 0xc1, 0x97, 0x03, 0x2e, 0xb9, 0x02, 0x77, 0xb2, 0x4d, 0x3b, 0xbc, 0xc8, + 0x92, 0xba, 0x92, 0x9c, 0x4b, 0x5e, 0x88, 0xb5, 0xb8, 0x96, 0x09, 0x53, 0x5c, 0x96, 0x5c, 0x39, + 0x51, 0x81, 0xa2, 0x0f, 0x7d, 0x2f, 0x50, 0xa0, 0xcf, 0xfd, 0xe7, 0xfa, 0x57, 0xf4, 0xa1, 0x40, + 0xb1, 0xcb, 0x25, 0x45, 0x7d, 0xc5, 0x79, 0xb8, 0x37, 0xce, 0xce, 0x6f, 0x3e, 0x76, 0x76, 0x66, + 0x76, 0x96, 0x00, 0x5d, 0x16, 0xd0, 0x23, 0x3f, 0x60, 0x9c, 0xa1, 0xa5, 0x0f, 0x61, 0x9f, 0x78, + 0x95, 0xe7, 0x5d, 0xe6, 0x71, 0xea, 0xf1, 0xc3, 0x90, 0x06, 0x0f, 0x4e, 0x97, 0x1e, 0x12, 0xdf, + 0x39, 0x76, 0x3c, 0x87, 0x3b, 0xc4, 0x75, 0xfe, 0x42, 0x83, 0x08, 0x5d, 0x79, 0xd6, 0x63, 0xac, + 0xe7, 0xd2, 0x63, 0x49, 0xdd, 0x0c, 0x6e, 0x8f, 0xb9, 0xd3, 0xa7, 0x21, 0x27, 0x7d, 0x3f, 0x02, + 0xe8, 0x3b, 0xb0, 0x75, 0x49, 0xf9, 0x5b, 0x16, 0xdc, 0x87, 0x3e, 0xe9, 0xd2, 0x10, 0xd3, 0x3f, + 0x0f, 0x68, 0xc8, 0xf5, 0x4b, 0xd8, 0x9e, 0x58, 0x0f, 0x7d, 0xe6, 0x85, 0x14, 0x1d, 0x41, 0x3e, + 0xe4, 0x84, 0x0f, 0xc2, 0x72, 0x66, 0x2f, 0xbb, 0xbf, 0x72, 0xb2, 0x73, 0x24, 0x1d, 0x3a, 0x4a, + 0xa0, 0x2d, 0xc9, 0xc5, 0x0a, 0xa5, 0xff, 0x27, 0x03, 0xdb, 0x2d, 0x4e, 0x82, 0x91, 0x2e, 0x65, + 0x02, 0x95, 0x60, 0xd1, 0xb1, 0xcb, 0x99, 0xbd, 0xcc, 0x7e, 0x11, 0x2f, 0x3a, 0x36, 0x7a, 0x0e, + 0x25, 0xb5, 0x19, 0xcb, 0x0f, 0xe8, 0xad, 0xf3, 0xb1, 0xbc, 0x28, 0x79, 0x6b, 0x6a, 0xb5, 0x29, + 0x17, 0xd1, 0x0b, 0x28, 0xf4, 0x29, 0x27, 0x36, 0xe1, 0xa4, 0x9c, 0xdd, 0xcb, 0xec, 0xaf, 0x9c, + 0x94, 0x27, 0x5d, 0xb8, 0x52, 0x7c, 0x9c, 0x20, 0xd1, 0x21, 0xe4, 0x42, 0x9f, 0x76, 0xcb, 0x39, + 0x29, 0xf1, 0x44, 0x49, 0x8c, 0x3b, 0xd6, 0xf2, 0x69, 0x17, 0x4b, 0x18, 0xda, 0x87, 0x1c, 0x1f, + 0xfa, 0xb4, 0x9c, 0xdf, 0xcb, 0xec, 0x97, 0x4e, 0xb6, 0x26, 0x0d, 0xb4, 0x87, 0x3e, 0xc5, 0x12, + 0xf1, 0x4b, 0xae, 0xb0, 0xa4, 0xe5, 0xf5, 0x03, 0xd8, 0x99, 0xdc, 0xa4, 0x8a, 0x97, 0x06, 0xd9, + 0x41, 0xe0, 0xaa, 0x6d, 0x8a, 0x4f, 0xfd, 0x3d, 0x6c, 0xb5, 0x38, 0xf3, 0x1f, 0x8d, 0xc7, 0x09, + 0xe4, 0x7d, 0xe6, 0x3a, 0xdd, 0xa1, 0x8c, 0x43, 0xe9, 0xa4, 0x92, 0x38, 0x9d, 0x12, 0x6e, 0x4a, + 0x04, 0x56, 0x48, 0x7d, 0x57, 0x04, 0x7b, 0x4c, 0x77, 0xe4, 0x86, 0x7e, 0x00, 0xe5, 0x73, 0x1a, + 0x76, 0x03, 0xe7, 0x86, 0x3e, 0x66, 0x58, 0x67, 0xf0, 0x64, 0x06, 0x76, 0xc6, 0xf9, 0x67, 0x1e, + 0x3f, 0x7f, 0xa4, 0xc3, 0xaa, 0x4b, 0x42, 0x5e, 0xed, 0x72, 0xe7, 0xc1, 0xe1, 0x43, 0x75, 0xa6, + 0x63, 0x6b, 0x3a, 0x02, 0xad, 0x35, 0xb8, 0x89, 0x2c, 0xc6, 0x09, 0xf8, 0xdf, 0x0c, 0x6c, 0xa4, + 0x16, 0x95, 0xf5, 0x6f, 0x3f, 0xcf, 0xfa, 0xeb, 0x85, 0xc4, 0xfe, 0x11, 0x64, 0x5d, 0xd6, 0x93, + 0x66, 0x57, 0x92, 0x10, 0x26, 0xf0, 0x1a, 0xeb, 0x5d, 0xd1, 0x30, 0x24, 0x3d, 0xfa, 0x7a, 0x01, + 0x0b, 0x20, 0xfa, 0x23, 0xe4, 0xef, 0x28, 0xb1, 0x69, 0x50, 0xce, 0xca, 0xfc, 0xfe, 0x3a, 0x8e, + 0xfa, 0xa4, 0x2f, 0x47, 0xaf, 0x25, 0xcc, 0xf0, 0x78, 0x30, 0xc4, 0x4a, 0xa6, 0xf2, 0x12, 0x56, + 0x52, 0xcb, 0xe2, 0xf0, 0xef, 0xe9, 0x30, 0x3e, 0xfc, 0x7b, 0x3a, 0x44, 0x5b, 0xb0, 0xf4, 0x40, + 0xdc, 0x01, 0x55, 0x71, 0x88, 0x88, 0x57, 0x8b, 0x3f, 0x64, 0x4e, 0x8b, 0xb0, 0xec, 0x93, 0xa1, + 0xcb, 0x88, 0xad, 0xff, 0x08, 0x1b, 0x57, 0x24, 0xb8, 0x97, 0xf1, 0x99, 0x9b, 0x1e, 0x3b, 0x90, + 0xef, 0xba, 0x2c, 0xa4, 0xb6, 0x54, 0x55, 0xc0, 0x8a, 0xd2, 0xb7, 0x00, 0xa5, 0x85, 0xd5, 0xf9, + 0xff, 0x04, 0x1b, 0x2d, 0xca, 0xdb, 0x4e, 0x9f, 0xb2, 0x01, 0x9f, 0xa7, 0xb2, 0x02, 0x05, 0x7b, + 0x10, 0x10, 0xee, 0x30, 0x4f, 0xf9, 0x97, 0xd0, 0x42, 0x6d, 0x5a, 0x81, 0x52, 0x4b, 0x00, 0x9d, + 0x31, 0x8f, 0x07, 0xcc, 0x6d, 0xb2, 0x80, 0x7f, 0xc2, 0x55, 0xfa, 0xd1, 0x67, 0x21, 0x8d, 0x5d, + 0x8d, 0x28, 0xf4, 0x3b, 0x55, 0x94, 0x51, 0x19, 0xaf, 0xab, 0x48, 0x0b, 0x4d, 0xa3, 0x52, 0xd4, + 0xb7, 0x61, 0x73, 0xcc, 0x84, 0xb2, 0xfc, 0x1c, 0x36, 0xdb, 0xe4, 0x9e, 0xb6, 0x3c, 0xe2, 0x87, + 0x77, 0x6c, 0x9e, 0x69, 0x7d, 0x1f, 0xb6, 0xc6, 0x61, 0x73, 0xcb, 0xf2, 0x1a, 0x76, 0x95, 0x9d, + 0xaa, 0xdd, 0x77, 0xc2, 0xd0, 0x61, 0xde, 0xbc, 0xfd, 0x7c, 0x03, 0x4b, 0x2e, 0x7d, 0xa0, 0xae, + 0x2a, 0xcc, 0x6d, 0xe5, 0x78, 0x22, 0x57, 0x13, 0x4c, 0x1c, 0x61, 0xf4, 0x0a, 0x94, 0xa7, 0xf5, + 0xaa, 0x4d, 0xfc, 0x3b, 0x0b, 0xeb, 0x13, 0xa9, 0x3b, 0x65, 0x2c, 0xdd, 0xef, 0x16, 0x3f, 0xbb, + 0xdf, 0xed, 0x8f, 0x85, 0x76, 0xaa, 0x81, 0xa5, 0x5a, 0xdd, 0x37, 0xb0, 0xe4, 0xdf, 0x91, 0x90, + 0xca, 0xd6, 0x38, 0xda, 0xcc, 0xa8, 0xc3, 0x08, 0x26, 0x8e, 0x30, 0xe8, 0x95, 0xb8, 0x8b, 0x3c, + 0xdb, 0x11, 0x29, 0x11, 0x96, 0x97, 0x66, 0x17, 0xd5, 0x59, 0x82, 0xc0, 0x29, 0x34, 0x2a, 0xc3, + 0x72, 0x3f, 0xaa, 0x35, 0xd9, 0x56, 0x8b, 0x38, 0x26, 0x45, 0x73, 0x0e, 0xa8, 0xcf, 0xca, 0xcb, + 0xaa, 0x39, 0xab, 0xbb, 0x4d, 0xf5, 0xfd, 0xa3, 0x4b, 0x87, 0xab, 0xa6, 0x22, 0x61, 0xe8, 0x7b, + 0x58, 0x0e, 0x06, 0x9e, 0xb8, 0xc9, 0xca, 0x05, 0x29, 0xf1, 0x74, 0xd2, 0x03, 0x1c, 0xb1, 0x4d, + 0xef, 0x96, 0xe1, 0x18, 0x8b, 0x4e, 0x20, 0x47, 0x06, 0xfc, 0xae, 0x5c, 0x94, 0x32, 0x5f, 0x4d, + 0xca, 0x54, 0x07, 0xfc, 0x8e, 0x7a, 0xdc, 0xe9, 0xca, 0x7c, 0xc7, 0x12, 0xab, 0xff, 0x2f, 0x03, + 0x6b, 0x63, 0x41, 0x43, 0xbf, 0x87, 0xf5, 0x0f, 0xf1, 0x82, 0xe5, 0xf4, 0xc5, 0x6e, 0xa2, 0xb3, + 0x2a, 0x25, 0xcb, 0xa6, 0x58, 0x45, 0x4f, 0xa1, 0xe8, 0xd8, 0x31, 0x44, 0x55, 0x93, 0x63, 0x2b, + 0x66, 0x05, 0x0a, 0xa2, 0x63, 0xb8, 0x34, 0x0c, 0xe5, 0x11, 0x15, 0x70, 0x42, 0xc7, 0xa9, 0x99, + 0x4b, 0x52, 0x13, 0xbd, 0x80, 0xb5, 0xa8, 0x62, 0x6c, 0xcb, 0x67, 0x01, 0x17, 0x81, 0xcf, 0xce, + 0x2a, 0x98, 0x55, 0x85, 0x12, 0x0b, 0xe1, 0xe7, 0xdf, 0x61, 0xe2, 0x64, 0x78, 0x54, 0xd8, 0xf2, + 0x08, 0x8a, 0x38, 0x26, 0xf5, 0xbf, 0x41, 0x21, 0xd6, 0x8e, 0x10, 0xe4, 0x84, 0x75, 0xb9, 0xdd, + 0x35, 0x2c, 0xbf, 0x45, 0x65, 0x73, 0x12, 0xf4, 0x28, 0x97, 0x3b, 0x5c, 0xc3, 0x8a, 0x42, 0xdf, + 0x03, 0x3c, 0x38, 0xa1, 0x73, 0xe3, 0xb8, 0xa2, 0xe7, 0x67, 0xc7, 0x32, 0x4b, 0x28, 0xbc, 0x4e, + 0x98, 0x38, 0x05, 0x9c, 0xde, 0xba, 0xfe, 0xaf, 0x1c, 0x6c, 0xce, 0x48, 0x2c, 0x61, 0xf8, 0x96, + 0x38, 0x2e, 0x8d, 0x2b, 0x45, 0x51, 0xe9, 0xad, 0x2c, 0x8e, 0x6d, 0x05, 0x9d, 0x43, 0xc9, 0x1f, + 0xb8, 0xae, 0xe3, 0xf5, 0xa2, 0x33, 0x09, 0x95, 0x5b, 0x5f, 0xce, 0x4d, 0xdf, 0x53, 0xc6, 0x5c, + 0xbc, 0xa6, 0x84, 0xe4, 0xb9, 0x85, 0x42, 0x4b, 0x3c, 0xa4, 0xd0, 0x8f, 0x4e, 0xc8, 0x43, 0x55, + 0x36, 0x8f, 0x69, 0x51, 0x42, 0x86, 0x94, 0x11, 0xc7, 0x1f, 0xaa, 0x8e, 0x24, 0x8b, 0xa8, 0x88, + 0x13, 0x1a, 0xfd, 0x09, 0xb6, 0x6f, 0x1d, 0x8f, 0xb8, 0xd6, 0x0d, 0xe9, 0xde, 0x0f, 0x7c, 0xab, + 0xcb, 0xfa, 0xbe, 0x4b, 0x79, 0x7c, 0x8e, 0x8f, 0x18, 0xda, 0x94, 0xb2, 0xa7, 0x52, 0xf4, 0x4c, + 0x49, 0xa2, 0x97, 0x50, 0xb0, 0xa9, 0xef, 0xb2, 0x21, 0xb5, 0xe5, 0x01, 0x3f, 0xaa, 0x25, 0x81, + 0x23, 0x13, 0x36, 0x3c, 0xca, 0x45, 0x6a, 0x5b, 0x1e, 0xe3, 0x56, 0x40, 0x89, 0x3d, 0x94, 0x55, + 0xf7, 0xa8, 0x8e, 0x75, 0x25, 0x57, 0x17, 0x5d, 0x97, 0xd8, 0x43, 0xf4, 0x0b, 0x6c, 0xde, 0x3a, + 0x41, 0xc8, 0xad, 0x41, 0x48, 0x03, 0x8b, 0xc4, 0x03, 0x41, 0x51, 0x35, 0x91, 0x68, 0x52, 0x3d, + 0x8a, 0x27, 0xd5, 0xa3, 0x76, 0x3c, 0xa9, 0xe2, 0x0d, 0x29, 0xd6, 0x09, 0x69, 0x90, 0x4c, 0x0c, + 0x7f, 0x85, 0x8d, 0xa9, 0xee, 0x27, 0xee, 0x56, 0xf6, 0xc1, 0xa3, 0x81, 0x4a, 0x89, 0x88, 0x40, + 0xbb, 0xa2, 0xed, 0x70, 0x62, 0x39, 0xb6, 0xca, 0x88, 0xbc, 0x20, 0x4d, 0x1b, 0xbd, 0x04, 0x08, + 0xc5, 0xcc, 0x46, 0x6d, 0x8b, 0x70, 0xd5, 0x28, 0x3f, 0xe5, 0x46, 0x51, 0xa1, 0xab, 0x5c, 0xef, + 0xc1, 0xd6, 0xac, 0x5e, 0x23, 0x6a, 0xde, 0x63, 0x36, 0xb5, 0x3c, 0xd2, 0x8f, 0xdb, 0x42, 0x41, + 0x2c, 0xd4, 0x49, 0x9f, 0xa2, 0x27, 0x50, 0xf0, 0x99, 0x1d, 0xf1, 0x54, 0x6e, 0xfa, 0xcc, 0x96, + 0xac, 0x5d, 0x58, 0x96, 0x72, 0x8e, 0x2f, 0xfd, 0x28, 0xe2, 0xbc, 0x20, 0x4d, 0x5f, 0x67, 0xb0, + 0x3b, 0xa7, 0x41, 0xa1, 0xef, 0xa0, 0x48, 0xe2, 0x0b, 0x45, 0xda, 0x9a, 0x7b, 0x11, 0x8d, 0x70, + 0xe8, 0x19, 0xac, 0xc8, 0xa8, 0x58, 0x9c, 0xdd, 0xd3, 0xf8, 0x92, 0x07, 0xb9, 0xd4, 0x16, 0x2b, + 0xfa, 0x3f, 0x72, 0x80, 0xa6, 0xa7, 0xe2, 0xdf, 0xa8, 0xeb, 0xfd, 0x0c, 0x6b, 0xb7, 0x94, 0xf0, + 0x41, 0x40, 0xad, 0x5b, 0x97, 0xf4, 0x42, 0x39, 0x62, 0x95, 0xa6, 0xdb, 0xf7, 0x45, 0x04, 0xba, + 0x70, 0x49, 0x0f, 0xaf, 0xde, 0x8e, 0x88, 0x10, 0x5d, 0xc0, 0x4a, 0xea, 0x91, 0xa3, 0xa6, 0xf9, + 0xaf, 0x27, 0x2f, 0x8c, 0x44, 0x91, 0x39, 0xc2, 0xe2, 0xb4, 0x20, 0x7a, 0x0e, 0x4b, 0x9f, 0xec, + 0xa4, 0x11, 0x17, 0xbd, 0x80, 0x65, 0xea, 0x3d, 0x3c, 0x90, 0x20, 0x2c, 0xe7, 0x25, 0x30, 0xbe, + 0xeb, 0x0c, 0xef, 0xc1, 0x09, 0x98, 0xd7, 0xa7, 0x1e, 0xbf, 0x26, 0x81, 0x43, 0x6e, 0x5c, 0x8a, + 0x63, 0x28, 0xfa, 0x06, 0x36, 0xba, 0x77, 0xb4, 0x7b, 0xcf, 0x06, 0xdc, 0x72, 0x59, 0x74, 0x5c, + 0xaa, 0xb1, 0x6a, 0x31, 0xa3, 0xa6, 0xd6, 0xd1, 0x21, 0xa0, 0x51, 0x64, 0x13, 0x74, 0x41, 0xa2, + 0x37, 0x3e, 0x8c, 0xe6, 0x54, 0x05, 0xdf, 0x83, 0x6c, 0xcf, 0xe1, 0xaa, 0x68, 0x4a, 0xca, 0x1b, + 0x71, 0x41, 0x0a, 0xaf, 0x05, 0x2b, 0xdd, 0x01, 0x61, 0xbc, 0x03, 0x8e, 0x65, 0xcc, 0xca, 0xe7, + 0x65, 0x8c, 0xfe, 0x23, 0x2c, 0x2b, 0xf5, 0xa2, 0x6b, 0x89, 0xd2, 0x4d, 0x27, 0x77, 0x4c, 0x8b, + 0xda, 0xa3, 0x7d, 0xe2, 0xb8, 0xf1, 0x5c, 0x2b, 0x09, 0xfd, 0x27, 0xd8, 0x9c, 0x11, 0x29, 0x71, + 0x93, 0xa4, 0x94, 0xe4, 0x62, 0x05, 0xd3, 0x83, 0xb1, 0x3e, 0x48, 0x75, 0xff, 0xd1, 0xac, 0xfe, + 0x1b, 0xcd, 0x48, 0xa9, 0x81, 0x24, 0x37, 0x36, 0x90, 0x1c, 0xbc, 0x80, 0xcd, 0x19, 0xaf, 0x2c, + 0xb4, 0x0a, 0x85, 0x7a, 0x03, 0x5f, 0x55, 0x6b, 0xb5, 0x77, 0xda, 0x02, 0x5a, 0x87, 0x15, 0xf3, + 0xea, 0xca, 0x38, 0x37, 0xab, 0x6d, 0xa3, 0xf6, 0x4e, 0xcb, 0x1c, 0xbc, 0x82, 0xd2, 0x78, 0x1c, + 0xd1, 0x16, 0x68, 0xd5, 0xf3, 0x2b, 0xb3, 0x6d, 0x35, 0xde, 0xd6, 0x0d, 0x6c, 0x35, 0xea, 0x52, + 0x10, 0x41, 0x29, 0x5a, 0x35, 0xae, 0x0d, 0xfc, 0xae, 0x51, 0x37, 0xb4, 0xcc, 0x81, 0x09, 0xa5, + 0xf1, 0x7b, 0x11, 0x3d, 0x85, 0xdd, 0x66, 0x03, 0xb7, 0xad, 0x6b, 0xb3, 0x65, 0x9e, 0x9a, 0x35, + 0xb3, 0xfd, 0xce, 0x6a, 0x62, 0xf3, 0xba, 0xda, 0x36, 0xb4, 0x05, 0x54, 0x81, 0x9d, 0x29, 0x66, + 0xe7, 0xb4, 0x66, 0x9e, 0x69, 0x99, 0x83, 0x1f, 0x60, 0x67, 0x76, 0x4b, 0x46, 0x45, 0x58, 0xba, + 0xa8, 0xd6, 0x5a, 0x42, 0x41, 0x01, 0x72, 0x6d, 0xdc, 0x31, 0xb4, 0x8c, 0x58, 0x34, 0xae, 0x9a, + 0xed, 0x77, 0xda, 0xe2, 0xc1, 0xdf, 0x33, 0x50, 0x1a, 0x9f, 0xfb, 0xd0, 0x0a, 0x2c, 0x77, 0xea, + 0x6f, 0xea, 0x8d, 0xb7, 0x75, 0x6d, 0x41, 0x10, 0x4d, 0xa3, 0x7e, 0x6e, 0xd6, 0x2f, 0xb5, 0x8c, + 0x08, 0xc6, 0x19, 0x36, 0xaa, 0x6d, 0x41, 0x2d, 0x22, 0x0d, 0x56, 0xcd, 0xba, 0xd9, 0x36, 0xab, + 0x35, 0xf3, 0xbd, 0x58, 0xc9, 0x0a, 0x30, 0xee, 0xd4, 0xeb, 0x82, 0xc8, 0xc9, 0x58, 0xd5, 0xdb, + 0x06, 0xc6, 0x9d, 0x66, 0xdb, 0x38, 0xd7, 0x96, 0x85, 0x74, 0xab, 0xdd, 0x68, 0x36, 0x05, 0x7b, + 0x49, 0x60, 0x25, 0x65, 0x9c, 0x6b, 0xf9, 0x83, 0x87, 0x54, 0x73, 0x4d, 0x75, 0x02, 0xe1, 0x72, + 0xbd, 0xd1, 0x68, 0x6a, 0x0b, 0xe8, 0x09, 0x6c, 0x5f, 0x74, 0x6a, 0x35, 0xeb, 0x6d, 0x03, 0xbf, + 0x69, 0x35, 0xab, 0x67, 0x86, 0x75, 0x5a, 0x3d, 0x7b, 0xd3, 0x69, 0x6a, 0x39, 0xb4, 0x09, 0xeb, + 0x17, 0xe6, 0xaf, 0xc6, 0xb9, 0x85, 0x8d, 0x56, 0xa3, 0x83, 0xcf, 0x8c, 0x96, 0xb6, 0x24, 0x02, + 0xde, 0x69, 0x19, 0xd8, 0xaa, 0x57, 0xaf, 0x0c, 0x89, 0xd7, 0xf2, 0x7a, 0xae, 0x90, 0xd1, 0x32, + 0x7a, 0xae, 0xb0, 0xa8, 0x2d, 0xea, 0xb9, 0x42, 0x56, 0xcb, 0x1e, 0xfc, 0x9c, 0x1a, 0xf5, 0xc4, + 0x70, 0x24, 0x77, 0x60, 0x5c, 0x76, 0x6a, 0x55, 0xac, 0x2d, 0x08, 0x87, 0x9b, 0xd8, 0x38, 0xed, + 0x98, 0xb5, 0xf3, 0x28, 0x68, 0x4d, 0xdc, 0x38, 0x35, 0xb4, 0x45, 0xf1, 0x79, 0xf9, 0xba, 0xd1, + 0x6a, 0x6b, 0xd9, 0x93, 0x7f, 0xe6, 0x41, 0x1b, 0x25, 0x1c, 0xf1, 0x48, 0x8f, 0x06, 0xa8, 0x06, + 0x6b, 0x63, 0x7f, 0x52, 0x50, 0xdc, 0xee, 0x66, 0xfd, 0x77, 0xa9, 0x7c, 0x31, 0x9b, 0xa9, 0xde, + 0x0b, 0x0b, 0xa8, 0x01, 0xa5, 0xf1, 0xf6, 0x8c, 0xbe, 0x98, 0xf9, 0x2f, 0x23, 0xd6, 0xf7, 0xe5, + 0x1c, 0x6e, 0xa2, 0xb0, 0x06, 0x6b, 0x63, 0xa9, 0x9e, 0xb8, 0x37, 0xeb, 0x1f, 0x45, 0xe5, 0x8b, + 0xd9, 0xcc, 0x44, 0xdb, 0xaf, 0xb0, 0x31, 0xf5, 0xeb, 0x00, 0x3d, 0x53, 0x42, 0xf3, 0x7e, 0x40, + 0x54, 0xf6, 0xe6, 0x03, 0x12, 0xcd, 0xa7, 0x50, 0x4c, 0x9e, 0xe0, 0x68, 0x77, 0xfa, 0x51, 0x1e, + 0x69, 0x2a, 0xcf, 0x7b, 0xad, 0xeb, 0x0b, 0xdf, 0x66, 0xd0, 0x19, 0xc0, 0xe8, 0x69, 0x8c, 0x62, + 0xec, 0xd4, 0x53, 0xbb, 0xf2, 0x64, 0x06, 0x27, 0x71, 0xe4, 0x0c, 0x60, 0xf4, 0x10, 0x4e, 0x94, + 0x4c, 0x3d, 0xae, 0x13, 0x25, 0x33, 0x5e, 0xcd, 0x0b, 0xe2, 0x1e, 0x4b, 0x3d, 0x6a, 0x51, 0x8c, + 0x9d, 0x7e, 0x4b, 0x57, 0x2a, 0xb3, 0x58, 0x89, 0x1e, 0x13, 0x56, 0xd3, 0xcf, 0x5b, 0x14, 0xa3, + 0x67, 0x3c, 0x8d, 0x2b, 0x4f, 0x67, 0xf2, 0x12, 0x55, 0x1d, 0xd0, 0x26, 0xdf, 0xa9, 0xe8, 0xab, + 0x71, 0xe3, 0x93, 0x0f, 0xe3, 0xca, 0xb3, 0xb9, 0xfc, 0x58, 0xed, 0xe9, 0x1f, 0xde, 0x1f, 0xf4, + 0x1c, 0x7e, 0x37, 0xb8, 0x39, 0xea, 0xb2, 0xfe, 0x71, 0xcf, 0xe1, 0x3e, 0xb3, 0x0f, 0x1d, 0xa6, + 0xbe, 0x8e, 0x3f, 0x84, 0x87, 0xfd, 0xa8, 0x50, 0x8e, 0x89, 0xef, 0xdc, 0xe4, 0xe5, 0xdc, 0xf5, + 0xdd, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x81, 0x92, 0xa3, 0xf2, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/components/ws-manager-api/go/mock/mock.go b/components/ws-manager-api/go/mock/mock.go index 81a2851c2ce5d9..8511e57dc38482 100644 --- a/components/ws-manager-api/go/mock/mock.go +++ b/components/ws-manager-api/go/mock/mock.go @@ -1,7 +1,3 @@ -// Copyright (c) 2021 Gitpod GmbH. All rights reserved. -// Licensed under the GNU Affero General Public License (AGPL). -// See License-AGPL.txt in the project root for license information. - // Code generated by MockGen. DO NOT EDIT. // Source: github.com/gitpod-io/gitpod/ws-manager/api (interfaces: WorkspaceManagerClient,WorkspaceManager_SubscribeClient) diff --git a/components/ws-manager-api/typescript/src/core_grpc_pb.d.ts b/components/ws-manager-api/typescript/src/core_grpc_pb.d.ts index c1f85f5a54da0c..7d71175d74e670 100644 --- a/components/ws-manager-api/typescript/src/core_grpc_pb.d.ts +++ b/components/ws-manager-api/typescript/src/core_grpc_pb.d.ts @@ -1,9 +1,3 @@ -/** - * Copyright (c) 2021 Gitpod GmbH. All rights reserved. - * Licensed under the GNU Affero General Public License (AGPL). - * See License-AGPL.txt in the project root for license information. - */ - // package: wsman // file: core.proto diff --git a/components/ws-manager-api/typescript/src/core_grpc_pb.js b/components/ws-manager-api/typescript/src/core_grpc_pb.js index fbc84e0b293a01..8395766093edbb 100644 --- a/components/ws-manager-api/typescript/src/core_grpc_pb.js +++ b/components/ws-manager-api/typescript/src/core_grpc_pb.js @@ -1,9 +1,3 @@ -/** - * Copyright (c) 2021 Gitpod GmbH. All rights reserved. - * Licensed under the GNU Affero General Public License (AGPL). - * See License-AGPL.txt in the project root for license information. - */ - // GENERATED CODE -- DO NOT EDIT! 'use strict'; diff --git a/components/ws-manager-api/typescript/src/core_pb.d.ts b/components/ws-manager-api/typescript/src/core_pb.d.ts index cba3f688e074c8..de9e4373564c14 100644 --- a/components/ws-manager-api/typescript/src/core_pb.d.ts +++ b/components/ws-manager-api/typescript/src/core_pb.d.ts @@ -1,9 +1,3 @@ -/** - * Copyright (c) 2021 Gitpod GmbH. All rights reserved. - * Licensed under the GNU Affero General Public License (AGPL). - * See License-AGPL.txt in the project root for license information. - */ - // package: wsman // file: core.proto @@ -735,6 +729,12 @@ export class WorkspaceRuntimeInfo extends jspb.Message { getNodeName(): string; setNodeName(value: string): WorkspaceRuntimeInfo; + getPodName(): string; + setPodName(value: string): WorkspaceRuntimeInfo; + + getNodeIp(): string; + setNodeIp(value: string): WorkspaceRuntimeInfo; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): WorkspaceRuntimeInfo.AsObject; @@ -749,6 +749,8 @@ export class WorkspaceRuntimeInfo extends jspb.Message { export namespace WorkspaceRuntimeInfo { export type AsObject = { nodeName: string, + podName: string, + nodeIp: string, } } diff --git a/components/ws-manager-api/typescript/src/core_pb.js b/components/ws-manager-api/typescript/src/core_pb.js index 40d4c84c288196..3d7bad43fafb92 100644 --- a/components/ws-manager-api/typescript/src/core_pb.js +++ b/components/ws-manager-api/typescript/src/core_pb.js @@ -1,9 +1,3 @@ -/** - * Copyright (c) 2021 Gitpod GmbH. All rights reserved. - * Licensed under the GNU Affero General Public License (AGPL). - * See License-AGPL.txt in the project root for license information. - */ - /** * @fileoverview * @enhanceable @@ -5138,7 +5132,9 @@ proto.wsman.WorkspaceRuntimeInfo.prototype.toObject = function(opt_includeInstan */ proto.wsman.WorkspaceRuntimeInfo.toObject = function(includeInstance, msg) { var f, obj = { - nodeName: jspb.Message.getFieldWithDefault(msg, 1, "") + nodeName: jspb.Message.getFieldWithDefault(msg, 1, ""), + podName: jspb.Message.getFieldWithDefault(msg, 2, ""), + nodeIp: jspb.Message.getFieldWithDefault(msg, 3, "") }; if (includeInstance) { @@ -5179,6 +5175,14 @@ proto.wsman.WorkspaceRuntimeInfo.deserializeBinaryFromReader = function(msg, rea var value = /** @type {string} */ (reader.readString()); msg.setNodeName(value); break; + case 2: + var value = /** @type {string} */ (reader.readString()); + msg.setPodName(value); + break; + case 3: + var value = /** @type {string} */ (reader.readString()); + msg.setNodeIp(value); + break; default: reader.skipField(); break; @@ -5215,6 +5219,20 @@ proto.wsman.WorkspaceRuntimeInfo.serializeBinaryToWriter = function(message, wri f ); } + f = message.getPodName(); + if (f.length > 0) { + writer.writeString( + 2, + f + ); + } + f = message.getNodeIp(); + if (f.length > 0) { + writer.writeString( + 3, + f + ); + } }; @@ -5233,6 +5251,36 @@ proto.wsman.WorkspaceRuntimeInfo.prototype.setNodeName = function(value) { }; +/** + * optional string pod_name = 2; + * @return {string} + */ +proto.wsman.WorkspaceRuntimeInfo.prototype.getPodName = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); +}; + + +/** @param {string} value */ +proto.wsman.WorkspaceRuntimeInfo.prototype.setPodName = function(value) { + jspb.Message.setProto3StringField(this, 2, value); +}; + + +/** + * optional string node_ip = 3; + * @return {string} + */ +proto.wsman.WorkspaceRuntimeInfo.prototype.getNodeIp = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); +}; + + +/** @param {string} value */ +proto.wsman.WorkspaceRuntimeInfo.prototype.setNodeIp = function(value) { + jspb.Message.setProto3StringField(this, 3, value); +}; + + diff --git a/components/ws-manager-bridge/src/bridge.ts b/components/ws-manager-bridge/src/bridge.ts index 273b919cbdb89b..7f3f4c3dafc5b3 100644 --- a/components/ws-manager-bridge/src/bridge.ts +++ b/components/ws-manager-bridge/src/bridge.ts @@ -121,7 +121,9 @@ export class WorkspaceManagerBridge implements Disposable { instance.status.conditions.timeout = status.conditions.timeout; instance.status.conditions.firstUserActivity = mapFirstUserActivity(rawStatus.getConditions()!.getFirstUserActivity()); instance.status.message = status.message; - instance.status.nodeName = instance.status.nodeName || (status.runtime || {}).nodeName; + instance.status.nodeName = instance.status.nodeName || status.runtime?.nodeName; + instance.status.podName = instance.status.podName || status.runtime?.podName; + instance.status.nodeIp = instance.status.nodeIp || status.runtime?.nodeIp; instance.status.ownerToken = status.auth!.ownerToken; if (status.repo) { diff --git a/components/ws-manager/go.sum b/components/ws-manager/go.sum index acd26f4dd46be5..29d179728be284 100644 --- a/components/ws-manager/go.sum +++ b/components/ws-manager/go.sum @@ -120,6 +120,10 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +<<<<<<< HEAD +======= +github.com/fatih/gomodifytags v1.12.0/go.mod h1:TbUyEjH1Zo0GkJd2Q52oVYqYcJ0eGNqG8bsiOb75P9c= +>>>>>>> 546870a ([protocol] add instance.status.podName) github.com/fatih/gomodifytags v1.13.0/go.mod h1:TbUyEjH1Zo0GkJd2Q52oVYqYcJ0eGNqG8bsiOb75P9c= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/components/ws-manager/pkg/manager/status.go b/components/ws-manager/pkg/manager/status.go index 55fed208896962..bd1709556548f1 100644 --- a/components/ws-manager/pkg/manager/status.go +++ b/components/ws-manager/pkg/manager/status.go @@ -360,6 +360,8 @@ func (m *Manager) getWorkspaceStatus(wso workspaceObjects) (*api.WorkspaceStatus }, Runtime: &api.WorkspaceRuntimeInfo{ NodeName: wso.Pod.Spec.NodeName, + PodName: wso.Pod.Name, + NodeIp: wso.Pod.Status.HostIP, }, Auth: &api.WorkspaceAuthentication{ Admission: admission, diff --git a/components/ws-manager/pkg/manager/testdata/getWorkspaces_podOnly.golden b/components/ws-manager/pkg/manager/testdata/getWorkspaces_podOnly.golden index ab21976a9bc0c4..d3d1586e9a631c 100644 --- a/components/ws-manager/pkg/manager/testdata/getWorkspaces_podOnly.golden +++ b/components/ws-manager/pkg/manager/testdata/getWorkspaces_podOnly.golden @@ -21,7 +21,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-staging--gitpod--workspace-pool-1-f122a8ea-bb2l" + "node_name": "gke-staging--gitpod--workspace-pool-1-f122a8ea-bb2l", + "pod_name": "ws-d6835d33-116f-4d3f-aeb6-ad628f4004b6", + "node_ip": "10.132.15.200" }, "auth": { "admission": 1, diff --git a/components/ws-manager/pkg/manager/testdata/status_brokenScheduler_UNKNOWN00.golden b/components/ws-manager/pkg/manager/testdata/status_brokenScheduler_UNKNOWN00.golden index a98ba98db28a02..bace6fedc88b9b 100644 --- a/components/ws-manager/pkg/manager/testdata/status_brokenScheduler_UNKNOWN00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_brokenScheduler_UNKNOWN00.golden @@ -18,7 +18,8 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-gitpod-dev-default-pool-b25aa276-3tl2" + "node_name": "gke-gitpod-dev-default-pool-b25aa276-3tl2", + "pod_name": "ws-fb291b69-7bbc-4865-a432-33f558f20091" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_errimgpull.golden b/components/ws-manager/pkg/manager/testdata/status_errimgpull.golden index b7a8b47259281c..3a8abb93a69312 100644 --- a/components/ws-manager/pkg/manager/testdata/status_errimgpull.golden +++ b/components/ws-manager/pkg/manager/testdata/status_errimgpull.golden @@ -19,7 +19,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-wl2d" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-wl2d", + "pod_name": "ws-f9d04251-f057-4287-b7b1-956093140c5d", + "node_ip": "10.132.15.195" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_errimgpull_CREATING01.golden b/components/ws-manager/pkg/manager/testdata/status_errimgpull_CREATING01.golden index db9e7bc3a992bd..b8427f6394d563 100644 --- a/components/ws-manager/pkg/manager/testdata/status_errimgpull_CREATING01.golden +++ b/components/ws-manager/pkg/manager/testdata/status_errimgpull_CREATING01.golden @@ -20,7 +20,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-1-f039fa9e-2jrb" + "node_name": "gke-gitpod-dev-worker-pool-1-f039fa9e-2jrb", + "pod_name": "ws-79be1e8b-a6de-4572-8627-99ef12303a88", + "node_ip": "10.132.0.25" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_failedBeforeStopping_explicitFail.golden b/components/ws-manager/pkg/manager/testdata/status_failedBeforeStopping_explicitFail.golden index 73255dc7392b8c..e2fc9f220ddf80 100644 --- a/components/ws-manager/pkg/manager/testdata/status_failedBeforeStopping_explicitFail.golden +++ b/components/ws-manager/pkg/manager/testdata/status_failedBeforeStopping_explicitFail.golden @@ -18,7 +18,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-fltt" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-fltt", + "pod_name": "ws-4f8ea7b8-b87d-42f2-b8dd-1a32fdbdf0d4", + "node_ip": "10.132.0.42" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_failedLogs_UNKNOWN00.golden b/components/ws-manager/pkg/manager/testdata/status_failedLogs_UNKNOWN00.golden index 83e1bfd8e6db41..ff52af61bd43b6 100644 --- a/components/ws-manager/pkg/manager/testdata/status_failedLogs_UNKNOWN00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_failedLogs_UNKNOWN00.golden @@ -27,7 +27,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-dev-workload-7fd27879-kn1v" + "node_name": "gke-dev-workload-7fd27879-kn1v", + "pod_name": "ws-f07f0f2e-08fb-433a-8282-fef07b596909", + "node_ip": "10.132.0.35" }, "auth": { "owner_token": "l\u003cM3U,%$Fe3/Y/515B;/*D:1HhQAaq0c" diff --git a/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN01.golden b/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN01.golden index 9792d32d36dc53..93d12a3818c261 100644 --- a/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN01.golden +++ b/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN01.golden @@ -19,7 +19,8 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-nmbw" + "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-nmbw", + "pod_name": "ws-cecf2a75-7225-4056-a125-fa3144b9c012" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN02.golden b/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN02.golden index 165ee63bfba46d..4d06f2ae1a1633 100644 --- a/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN02.golden +++ b/components/ws-manager/pkg/manager/testdata/status_failedPending_evicted_UNKNOWN02.golden @@ -20,7 +20,8 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-nmbw" + "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-nmbw", + "pod_name": "ws-cecf2a75-7225-4056-a125-fa3144b9c012" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_failedTheiaMount_PENDING00.golden b/components/ws-manager/pkg/manager/testdata/status_failedTheiaMount_PENDING00.golden index 74a9bd9b0178c8..07e2b49a803aef 100644 --- a/components/ws-manager/pkg/manager/testdata/status_failedTheiaMount_PENDING00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_failedTheiaMount_PENDING00.golden @@ -19,7 +19,8 @@ }, "message": "pod is pending", "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-1wgf" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-1wgf", + "pod_name": "ws-b3242d9b-6920-41b5-8e72-c3d5637ca148" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_failedWorkspaceMount_PENDING00.golden b/components/ws-manager/pkg/manager/testdata/status_failedWorkspaceMount_PENDING00.golden index 3d2bcf40cf77c6..68ea49bd51358c 100644 --- a/components/ws-manager/pkg/manager/testdata/status_failedWorkspaceMount_PENDING00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_failedWorkspaceMount_PENDING00.golden @@ -19,7 +19,8 @@ }, "message": "pod is pending", "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-1wgf" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-1wgf", + "pod_name": "ws-b3242d9b-6920-41b5-8e72-c3d5637ca148" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.golden b/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.golden index 4779e5ab7dedc4..6844454c0457ea 100644 --- a/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.golden +++ b/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.golden @@ -80,7 +80,9 @@ } }, "runtime": { - "node_name": "gke-staging--gitpod--workspace-pool-2-331a2b32-mgbq" + "node_name": "gke-staging--gitpod--workspace-pool-2-331a2b32-mgbq", + "pod_name": "ws-df376c57-7a0e-4233-976a-7a021e6f088c", + "node_ip": "10.132.15.227" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.golden b/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.golden index 9d311abc5a6f61..9cb47b6f8a52a2 100644 --- a/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.golden @@ -31,7 +31,9 @@ } }, "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-1-3df476cf-qxwr" + "node_name": "gke-gitpod-dev-worker-pool-1-3df476cf-qxwr", + "pod_name": "ws-27e46234-5004-44c1-a2e8-56d68ac3c70b", + "node_ip": "10.132.0.12" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted.golden b/components/ws-manager/pkg/manager/testdata/status_interrupted.golden index 3e2fc48b1a0c28..48c93d81c038d5 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted.golden +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted.golden @@ -31,7 +31,9 @@ }, "message": "container workspace was terminated unexpectedly - workspace should recover", "runtime": { - "node_name": "gke-gitpod-staging-e-workspace-pool-2-2eb903d0-g86k" + "node_name": "gke-gitpod-staging-e-workspace-pool-2-2eb903d0-g86k", + "pod_name": "ws-283522ed-51f1-4838-951b-0f115c0a7aae", + "node_ip": "10.132.0.35" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.golden b/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.golden index c9b2774bf3c00c..bbde3a696b92ab 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.golden @@ -19,7 +19,9 @@ }, "message": "container workspace was terminated unexpectedly - workspace is recovering", "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-rl94" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-rl94", + "pod_name": "ws-4bf2e82d-cdc7-4764-b8ad-6973e3c4a629", + "node_ip": "10.132.0.30" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.golden b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.golden index bfcd88ea0249e4..708e38fb0009e0 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.golden +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.golden @@ -26,7 +26,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-production--gitp-workspace-pool-1-ee6c94af-h6lj" + "node_name": "gke-production--gitp-workspace-pool-1-ee6c94af-h6lj", + "pod_name": "ws-da9ffbf1-a12d-4a58-8593-475394eedb00", + "node_ip": "10.132.0.56" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.golden b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.golden index 7614cf7af52190..8569b574a42da9 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.golden +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.golden @@ -28,7 +28,9 @@ }, "message": "container network not ready - workspace should recover shortly", "runtime": { - "node_name": "gke-production--gitp-workspace-pool-1-c73d13c7-fzbk" + "node_name": "gke-production--gitp-workspace-pool-1-c73d13c7-fzbk", + "pod_name": "ws-0c5a8ef3-052b-44a7-b11c-3542a0928076", + "node_ip": "10.132.0.17" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.golden b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.golden index 99286de40c9799..4272641d201324 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.golden +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.golden @@ -26,7 +26,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-production--gitp-workspace-pool-1-c73d13c7-fzbk" + "node_name": "gke-production--gitp-workspace-pool-1-c73d13c7-fzbk", + "pod_name": "ws-0c5a8ef3-052b-44a7-b11c-3542a0928076", + "node_ip": "10.132.0.17" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_ownerToken.golden b/components/ws-manager/pkg/manager/testdata/status_ownerToken.golden index cb839c4370c607..21bc5c2255a4c3 100644 --- a/components/ws-manager/pkg/manager/testdata/status_ownerToken.golden +++ b/components/ws-manager/pkg/manager/testdata/status_ownerToken.golden @@ -80,7 +80,9 @@ } }, "runtime": { - "node_name": "gke-staging--gitpod--workspace-pool-2-331a2b32-mgbq" + "node_name": "gke-staging--gitpod--workspace-pool-2-331a2b32-mgbq", + "pod_name": "ws-df376c57-7a0e-4233-976a-7a021e6f088c", + "node_ip": "10.132.15.227" }, "auth": { "admission": 1, diff --git a/components/ws-manager/pkg/manager/testdata/status_plis_stopping01.golden b/components/ws-manager/pkg/manager/testdata/status_plis_stopping01.golden index e6ec2fbb4224ea..5ada4c6e10503b 100644 --- a/components/ws-manager/pkg/manager/testdata/status_plis_stopping01.golden +++ b/components/ws-manager/pkg/manager/testdata/status_plis_stopping01.golden @@ -18,7 +18,9 @@ "deployed": 1 }, "runtime": { - "node_name": "minikube" + "node_name": "minikube", + "pod_name": "ws-foobaz", + "node_ip": "10.0.2.15" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_prebuildSuccess_RUNNING01.golden b/components/ws-manager/pkg/manager/testdata/status_prebuildSuccess_RUNNING01.golden index b2ba248257e15e..05c3c44455b3f9 100644 --- a/components/ws-manager/pkg/manager/testdata/status_prebuildSuccess_RUNNING01.golden +++ b/components/ws-manager/pkg/manager/testdata/status_prebuildSuccess_RUNNING01.golden @@ -20,7 +20,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-845g" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-845g", + "pod_name": "ws-64f47106-40bb-4dd3-a33e-ccb9d7a09052", + "node_ip": "10.132.0.18" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.golden b/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.golden index 049f583bfec6fc..4bf26d5e3e82ab 100644 --- a/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.golden @@ -25,7 +25,9 @@ }, "message": "workspace initializer is running", "runtime": { - "node_name": "minikube" + "node_name": "minikube", + "pod_name": "ws-foobas", + "node_ip": "10.0.2.15" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden b/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden index 2d52bf9940f208..733ef2332dfaf0 100644 --- a/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden @@ -20,7 +20,9 @@ "deployed": 1 }, "runtime": { - "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-tmz8" + "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-tmz8", + "pod_name": "ws-2513d0b4-3c18-4735-b32e-1bbdead24b78", + "node_ip": "10.132.0.10" }, "auth": {} } diff --git a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.golden b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.golden index d5eebeb1aa6c7f..274ff3595001aa 100644 --- a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.golden @@ -26,7 +26,9 @@ }, "message": "containers are starting", "runtime": { - "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-g6l3" + "node_name": "gke-gitpod-dev-worker-pool-2-184c607e-g6l3", + "pod_name": "ws-foobar", + "node_ip": "10.132.15.216" }, "auth": {} }