diff --git a/api/handler/pod_action.go b/api/handler/pod_action.go index a809fccd0..760a643d6 100644 --- a/api/handler/pod_action.go +++ b/api/handler/pod_action.go @@ -1,10 +1,9 @@ package handler import ( - "encoding/json" + "github.com/goodrain/rainbond/worker/server/pb" "strings" - "github.com/goodrain/rainbond/api/model" "github.com/goodrain/rainbond/worker/client" "github.com/goodrain/rainbond/worker/server" ) @@ -15,7 +14,7 @@ type PodAction struct { } // PodDetail - -func (p *PodAction) PodDetail(serviceID, podName string) (*model.PodDetail, error) { +func (p *PodAction) PodDetail(serviceID, podName string) (*pb.PodDetail, error) { pd, err := p.statusCli.GetPodDetail(serviceID, podName) if err != nil { if strings.Contains(err.Error(), server.ErrPodNotFound.Error()) { @@ -23,14 +22,5 @@ func (p *PodAction) PodDetail(serviceID, podName string) (*model.PodDetail, erro } return nil, err } - b, err := json.Marshal(pd) - if err != nil { - return nil, err - } - var podDetail model.PodDetail - if err := json.Unmarshal(b, &podDetail); err != nil { - return nil, err - } - podDetail.Status.Type = pd.Status.Type.String() - return &podDetail, nil + return pd, nil } diff --git a/api/handler/pod_handler.go b/api/handler/pod_handler.go index 214e5a4e0..420664edf 100644 --- a/api/handler/pod_handler.go +++ b/api/handler/pod_handler.go @@ -1,13 +1,13 @@ package handler import ( - "github.com/goodrain/rainbond/api/model" "github.com/goodrain/rainbond/worker/client" + "github.com/goodrain/rainbond/worker/server/pb" ) // PodHandler defines handler methods about k8s pods. type PodHandler interface { - PodDetail(serviceID, podName string) (*model.PodDetail, error) + PodDetail(serviceID, podName string) (*pb.PodDetail, error) } // NewPodHandler creates a new PodHandler. diff --git a/api/model/pods.go b/api/model/pods.go index fc885342d..35035725b 100644 --- a/api/model/pods.go +++ b/api/model/pods.go @@ -14,7 +14,8 @@ type PodDetail struct { // PodStatus - type PodStatus struct { - Type string `json:"type,omitempty"` + Type int `json:"type,omitempty"` + TypeStr string `json:"type_str,omitempty"` Reason string `json:"reason,omitempty"` Message string `json:"message,omitempty"` Advice string `json:"advice,omitempty"` @@ -22,12 +23,12 @@ type PodStatus struct { // PodContainer - type PodContainer struct { - Image string `json:"image,omitempty"` - State string `json:"state,omitempty"` - Reason string `json:"reason,omitempty"` - Started string `json:"started,omitempty"` - LimitMemory string `json:"limit_memory,omitempty"` - LimitCPU string `json:"limit_cpu,omitempty"` + Image string `json:"image,omitempty"` + State string `json:"state,omitempty"` + Reason string `json:"reason,omitempty"` + Started string `json:"started,omitempty"` + LimitMemory string `json:"limit_memory,omitempty"` + LimitCPU string `json:"limit_cpu,omitempty"` } // PodEvent - diff --git a/worker/server/pb/app_runtime_server.pb.go b/worker/server/pb/app_runtime_server.pb.go index e10d60a15..91db8c479 100644 --- a/worker/server/pb/app_runtime_server.pb.go +++ b/worker/server/pb/app_runtime_server.pb.go @@ -1185,6 +1185,7 @@ type PodStatus struct { Reason string `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason,omitempty"` Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` Advice string `protobuf:"bytes,4,opt,name=advice,proto3" json:"advice,omitempty"` + TypeStr string `protobuf:"bytes,5,opt,name=type_str,json=typeStr,proto3" json:"type_str,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1243,6 +1244,13 @@ func (m *PodStatus) GetAdvice() string { return "" } +func (m *PodStatus) GetTypeStr() string { + if m != nil { + return m.TypeStr + } + return "" +} + type PodContainer struct { Image string `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"` State string `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` @@ -1471,108 +1479,109 @@ func init() { func init() { proto.RegisterFile("app_runtime_server.proto", fileDescriptor_f94cf1a886c479d6) } var fileDescriptor_f94cf1a886c479d6 = []byte{ - // 1602 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x73, 0x1b, 0x45, - 0x10, 0xb6, 0xde, 0x52, 0xcb, 0x92, 0xe5, 0x49, 0x9c, 0x6c, 0x94, 0x84, 0x24, 0x4b, 0x92, 0x72, - 0x15, 0x29, 0x13, 0x0c, 0xa9, 0x38, 0x8f, 0x0a, 0xa5, 0x48, 0xc2, 0x51, 0x61, 0x2b, 0xae, 0xb5, - 0x5c, 0x1c, 0x55, 0x6b, 0xed, 0xc4, 0x2c, 0xd1, 0xee, 0x0e, 0xfb, 0x30, 0xa5, 0x23, 0x1c, 0xf2, - 0x07, 0xb8, 0xf2, 0x87, 0xb8, 0x50, 0xfc, 0x13, 0x2e, 0xfc, 0x00, 0xaa, 0x7b, 0x66, 0x1f, 0x7a, - 0xa4, 0x82, 0x81, 0x2a, 0x6e, 0x33, 0x3d, 0xdf, 0xd7, 0x3d, 0xdd, 0xd3, 0xd3, 0xd3, 0xbb, 0xa0, - 0x99, 0x42, 0x8c, 0xfd, 0xc8, 0x0d, 0x6d, 0x87, 0x8f, 0x03, 0xee, 0x9f, 0x73, 0x7f, 0x47, 0xf8, - 0x5e, 0xe8, 0xb1, 0xbc, 0x38, 0xd5, 0x2b, 0x50, 0xea, 0x3b, 0x22, 0x9c, 0xe9, 0x9f, 0x42, 0xf3, - 0x98, 0xfb, 0xe7, 0xf6, 0x84, 0x1b, 0xfc, 0xfb, 0x88, 0x07, 0x21, 0xbb, 0x09, 0x10, 0x48, 0xc9, - 0xd8, 0xb6, 0xb4, 0xdc, 0xed, 0xdc, 0x76, 0xcd, 0xa8, 0x29, 0xc9, 0xc0, 0xd2, 0x77, 0x61, 0x43, - 0x11, 0x82, 0x98, 0x71, 0x0b, 0xea, 0x29, 0x23, 0x50, 0x14, 0x48, 0x28, 0x81, 0xfe, 0x00, 0x1a, - 0x23, 0xee, 0x9a, 0x6e, 0x18, 0x33, 0xae, 0x43, 0x2d, 0x24, 0x41, 0x6a, 0xa2, 0x2a, 0x05, 0x03, - 0x4b, 0xff, 0x31, 0x07, 0x8d, 0xe3, 0xd0, 0x0c, 0xa3, 0xe0, 0x90, 0x07, 0x81, 0x79, 0xc6, 0xd9, - 0x23, 0x28, 0x07, 0x24, 0xd0, 0x72, 0xb7, 0x0b, 0xdb, 0xf5, 0xdd, 0x9b, 0x3b, 0xe2, 0x74, 0x67, - 0x0e, 0xa2, 0x66, 0x7d, 0x37, 0xf4, 0x67, 0x86, 0x02, 0xb7, 0x9f, 0x40, 0x3d, 0x23, 0x66, 0x2d, - 0x28, 0xbc, 0xe5, 0x33, 0x65, 0x0e, 0x87, 0xec, 0x32, 0x94, 0xce, 0xcd, 0x69, 0xc4, 0xb5, 0x3c, - 0xc9, 0xe4, 0xe4, 0x69, 0x7e, 0x2f, 0xa7, 0xcf, 0xa0, 0xde, 0xb3, 0x83, 0xb7, 0xf1, 0x06, 0x1e, - 0x42, 0xc9, 0xb2, 0x83, 0xb7, 0xb1, 0xfd, 0x36, 0xda, 0xcf, 0xac, 0xd3, 0x58, 0x19, 0x97, 0xc0, - 0xf6, 0x1e, 0x40, 0x2a, 0xfc, 0x90, 0xe9, 0x5c, 0xd6, 0xb4, 0x03, 0x9b, 0x2a, 0xc0, 0x1d, 0x21, - 0x8e, 0x3c, 0xeb, 0xc0, 0x0e, 0x42, 0xf6, 0x09, 0x54, 0xbc, 0xa9, 0x75, 0xe4, 0x59, 0xf1, 0x16, - 0x36, 0x29, 0x04, 0x59, 0x9c, 0x11, 0x23, 0x10, 0xec, 0xf2, 0x1f, 0x08, 0x9c, 0x7f, 0x2f, 0x58, - 0x21, 0xf4, 0xdf, 0xf2, 0xd0, 0x98, 0x5b, 0xfa, 0x40, 0x02, 0xe0, 0xd9, 0x59, 0x5c, 0x4c, 0xbd, - 0x19, 0xae, 0xca, 0xc0, 0x55, 0xa5, 0x60, 0x60, 0x61, 0x2a, 0xa8, 0xc5, 0x70, 0x26, 0xb8, 0x56, - 0x90, 0xa9, 0x20, 0x45, 0xa3, 0x99, 0xe0, 0xec, 0x1a, 0x54, 0x85, 0x67, 0x8d, 0x5d, 0xd3, 0xe1, - 0x5a, 0x91, 0x56, 0x2b, 0xc2, 0xb3, 0x86, 0xa6, 0xc3, 0xd9, 0x16, 0x94, 0x71, 0xc9, 0x16, 0x5a, - 0x49, 0x1e, 0x87, 0xf0, 0xac, 0x81, 0xc0, 0xed, 0xa0, 0x58, 0x25, 0x40, 0x59, 0x6e, 0x47, 0x78, - 0x96, 0x3c, 0x5a, 0xd6, 0x01, 0x98, 0x78, 0x6e, 0x68, 0xda, 0x2e, 0xf7, 0x03, 0xad, 0x42, 0xfe, - 0xde, 0x59, 0xf2, 0x77, 0xa7, 0x9b, 0x60, 0xe4, 0x31, 0x65, 0x48, 0xed, 0x03, 0xd8, 0x58, 0x58, - 0x5e, 0x71, 0x60, 0x1f, 0x67, 0x0f, 0xac, 0xbe, 0xdb, 0x40, 0x13, 0x09, 0x2b, 0x7b, 0x7e, 0x27, - 0x50, 0x4b, 0xe4, 0xec, 0x1e, 0x34, 0x13, 0x43, 0xd2, 0x69, 0xa9, 0xb2, 0x91, 0x48, 0xc9, 0xf5, - 0x3b, 0xb0, 0xee, 0x70, 0xc7, 0xf3, 0x67, 0xe3, 0xa9, 0xed, 0xd8, 0x21, 0xd9, 0x28, 0x18, 0x75, - 0x29, 0x3b, 0x40, 0x91, 0xfe, 0x47, 0x19, 0xa0, 0x27, 0xc3, 0xec, 0xbe, 0xf1, 0xd8, 0x0d, 0xa8, - 0xa1, 0xba, 0x40, 0x98, 0x93, 0x58, 0x67, 0x2a, 0x60, 0x3a, 0xac, 0x63, 0xbc, 0xf8, 0x9b, 0x68, - 0xca, 0x03, 0x1e, 0xaa, 0x63, 0x9a, 0x93, 0xb1, 0x8f, 0x40, 0x9d, 0x8b, 0xc3, 0xdd, 0x70, 0xfe, - 0xa4, 0x50, 0x42, 0x69, 0x10, 0x9a, 0x7e, 0x38, 0xc6, 0x0a, 0xa2, 0xce, 0xaa, 0x46, 0x92, 0x91, - 0xed, 0x70, 0xf6, 0x00, 0x8a, 0x02, 0x33, 0xac, 0x44, 0x11, 0xd7, 0xe8, 0x46, 0x24, 0xdb, 0xdb, - 0xc1, 0xd4, 0x92, 0x81, 0x26, 0x14, 0xdb, 0x83, 0xaa, 0xca, 0x20, 0x3c, 0x42, 0x64, 0xdc, 0x58, - 0x60, 0xc4, 0x45, 0x45, 0xb2, 0x12, 0x34, 0x7b, 0x06, 0x35, 0xee, 0x5a, 0xc2, 0xb3, 0xdd, 0x30, - 0x3e, 0xde, 0x9b, 0x0b, 0xd4, 0x7e, 0xbc, 0x2e, 0xb9, 0x29, 0x9e, 0x3d, 0x82, 0x4a, 0xc0, 0x27, - 0x3e, 0x0f, 0x03, 0xad, 0x4a, 0xd4, 0xeb, 0x4b, 0x56, 0x69, 0x55, 0x12, 0x63, 0x2c, 0xda, 0xb4, - 0xdd, 0x33, 0x9f, 0x07, 0x01, 0x0f, 0xb4, 0xda, 0x4a, 0x9b, 0x83, 0x78, 0x5d, 0xd9, 0x4c, 0xf0, - 0xac, 0x03, 0x75, 0x9f, 0x8b, 0xa9, 0x3d, 0x31, 0x43, 0x0c, 0x3d, 0x10, 0xfd, 0xd6, 0x02, 0xdd, - 0x48, 0x11, 0x52, 0x41, 0x96, 0xc3, 0xae, 0x24, 0xf5, 0xae, 0x4e, 0x61, 0x8f, 0x0b, 0xda, 0x63, - 0xa8, 0x25, 0x81, 0xbd, 0x48, 0x39, 0x6b, 0x3f, 0x4b, 0xee, 0xf8, 0x3f, 0x20, 0x3f, 0x87, 0xe6, - 0x7c, 0x84, 0x2f, 0xc4, 0x7e, 0x0a, 0xeb, 0xd9, 0x20, 0x5f, 0xd4, 0xf2, 0x7c, 0x9c, 0x2f, 0xc4, - 0x7e, 0x01, 0xad, 0xc5, 0x30, 0x5f, 0xe8, 0x0d, 0xf8, 0xbd, 0x00, 0xcd, 0xf8, 0xd9, 0x0a, 0xbc, - 0xc8, 0x9f, 0x70, 0x2c, 0x6f, 0x13, 0x11, 0x8d, 0x7d, 0xf9, 0x8c, 0x91, 0x9a, 0x82, 0x01, 0x13, - 0x11, 0x65, 0x1e, 0x36, 0x04, 0x64, 0x6f, 0x71, 0x75, 0x22, 0x22, 0xba, 0xc2, 0x58, 0x0c, 0xd4, - 0x2d, 0x8f, 0x15, 0x14, 0x08, 0xd1, 0x90, 0xd2, 0x58, 0xc7, 0x62, 0x31, 0x28, 0x2e, 0x15, 0x03, - 0x76, 0x1f, 0x36, 0xfc, 0xc8, 0x75, 0x6d, 0xf7, 0x6c, 0x8c, 0xcf, 0xbc, 0x1b, 0x39, 0x54, 0x33, - 0x0b, 0x46, 0x43, 0x89, 0x3b, 0x42, 0x0c, 0x23, 0x87, 0xe9, 0xd0, 0x88, 0xdc, 0x60, 0x62, 0x8d, - 0xd5, 0xae, 0xa9, 0x7c, 0x16, 0x8c, 0x3a, 0x09, 0xbb, 0xb4, 0x6d, 0xd4, 0x95, 0x62, 0xa4, 0xc5, - 0x8a, 0xd4, 0x15, 0xa3, 0xa4, 0xcd, 0x6d, 0x68, 0x49, 0x5c, 0xea, 0x83, 0x56, 0x25, 0x60, 0x93, - 0xe4, 0x87, 0xb1, 0x13, 0xec, 0x01, 0xb0, 0x39, 0xa4, 0x54, 0x5a, 0x23, 0x6c, 0x2b, 0x83, 0x95, - 0x7a, 0x3f, 0x83, 0xad, 0xac, 0x2f, 0xe1, 0xb7, 0xb6, 0x6f, 0x91, 0x47, 0x40, 0x04, 0x96, 0x7a, - 0x34, 0xc2, 0x25, 0x74, 0xeb, 0x31, 0x68, 0x59, 0x8a, 0xed, 0x86, 0xdc, 0x77, 0xcd, 0x29, 0xb1, - 0xea, 0xc4, 0xda, 0x4a, 0x59, 0x03, 0xb5, 0x3a, 0x8c, 0x1c, 0xfd, 0xa7, 0x1c, 0x5c, 0xeb, 0x58, - 0x16, 0x29, 0x3a, 0x32, 0xfd, 0x70, 0x96, 0x24, 0x36, 0xee, 0x9b, 0x41, 0x31, 0x8a, 0x92, 0x27, - 0x8f, 0xc6, 0x98, 0x30, 0x41, 0xf2, 0xce, 0xe1, 0x90, 0x35, 0x21, 0x6f, 0x0b, 0x55, 0x2f, 0xf3, - 0xb6, 0x40, 0x96, 0xf0, 0x7c, 0x79, 0x4c, 0x25, 0x83, 0xc6, 0x98, 0x06, 0x76, 0x30, 0xf6, 0xdc, - 0xa9, 0xed, 0x72, 0x3a, 0x99, 0xaa, 0x51, 0xb5, 0x83, 0xd7, 0x34, 0xa7, 0x4d, 0x9c, 0x88, 0xff, - 0x79, 0x13, 0x1d, 0xb8, 0xd6, 0xe3, 0xd3, 0x7f, 0xb3, 0x07, 0xfd, 0xe7, 0x1c, 0xb0, 0x65, 0x05, - 0xff, 0xa1, 0x03, 0x69, 0x19, 0x2c, 0x65, 0xcb, 0xe0, 0xbc, 0x63, 0xe5, 0x05, 0xc7, 0xbe, 0x84, - 0x4b, 0x2b, 0xbc, 0x62, 0xdb, 0x50, 0xf0, 0x4e, 0xbf, 0x53, 0xcd, 0xd3, 0x15, 0xac, 0xc6, 0xcb, - 0x28, 0x03, 0x21, 0xfa, 0x5d, 0x68, 0x61, 0xcb, 0x85, 0x85, 0xf6, 0xe5, 0xec, 0x78, 0xd0, 0xc3, - 0x80, 0xa8, 0xfd, 0xe7, 0x52, 0xe7, 0x5f, 0xc0, 0xc6, 0x3e, 0x47, 0x50, 0x8f, 0x87, 0xa6, 0x3d, - 0x5d, 0x09, 0x9a, 0x6b, 0x76, 0xf2, 0x73, 0xcd, 0x8e, 0x7e, 0x0a, 0xd5, 0x23, 0xcf, 0xea, 0x9f, - 0x73, 0x19, 0x31, 0xea, 0x96, 0x54, 0xc4, 0x70, 0x8c, 0xbe, 0xfb, 0xdc, 0x0c, 0x3c, 0x57, 0x11, - 0xd5, 0x0c, 0x8d, 0x98, 0x67, 0x71, 0x63, 0x85, 0x43, 0xa6, 0x41, 0xc5, 0x91, 0x6d, 0xa8, 0x0a, - 0x53, 0x3c, 0xd5, 0xdf, 0xe5, 0xe9, 0xbd, 0x50, 0x8d, 0xd2, 0xfd, 0x8c, 0x95, 0xe6, 0x2e, 0xc3, - 0x10, 0x24, 0x8b, 0x3b, 0xd8, 0x9b, 0x7d, 0xc0, 0x72, 0xc6, 0x4e, 0x61, 0xce, 0x0e, 0x32, 0x4c, - 0x0b, 0x1f, 0x17, 0xd5, 0x25, 0xa8, 0x99, 0xfe, 0x2e, 0x07, 0x45, 0x6a, 0xfa, 0xea, 0x50, 0x39, - 0xea, 0x0f, 0x7b, 0x83, 0xe1, 0x7e, 0x6b, 0x0d, 0x27, 0xc6, 0xc9, 0x70, 0x88, 0x93, 0x1c, 0x6b, - 0x40, 0xed, 0xf8, 0xa4, 0xdb, 0xed, 0xf7, 0x7b, 0xfd, 0x5e, 0x2b, 0xcf, 0x00, 0xca, 0x5f, 0x75, - 0x06, 0x07, 0xfd, 0x5e, 0xab, 0x80, 0xb8, 0x93, 0xe1, 0xd7, 0xc3, 0xd7, 0xdf, 0x0c, 0x5b, 0x45, - 0xd6, 0x04, 0x18, 0xf5, 0x0f, 0x07, 0xc3, 0xce, 0x08, 0x79, 0x25, 0xb6, 0x0e, 0xd5, 0xce, 0xcb, - 0xe1, 0x6b, 0xe3, 0xb0, 0x73, 0xd0, 0x2a, 0xe3, 0xea, 0x60, 0x38, 0x18, 0x0d, 0xe4, 0x6a, 0x05, - 0xe7, 0xc7, 0xdd, 0x57, 0xfd, 0xde, 0xc9, 0x01, 0xce, 0xab, 0xfa, 0x9f, 0x39, 0x58, 0x3f, 0xf2, - 0xac, 0xb4, 0x2d, 0xbb, 0x0c, 0x25, 0xdb, 0x41, 0x4f, 0x64, 0xc8, 0xe5, 0x04, 0xa5, 0xd4, 0x21, - 0xc5, 0x4f, 0x01, 0x4d, 0x32, 0xf1, 0x28, 0x2c, 0xc6, 0x83, 0xba, 0x21, 0x6e, 0xc5, 0x8d, 0xac, - 0x9a, 0x62, 0x01, 0xa7, 0x92, 0xa7, 0xea, 0x9f, 0x3a, 0x96, 0x3a, 0xc9, 0x64, 0xe5, 0xc3, 0x14, - 0x96, 0x90, 0x89, 0x88, 0x54, 0x4f, 0x5b, 0x25, 0x41, 0x57, 0x44, 0xf8, 0x4e, 0xa8, 0x07, 0x22, - 0xd6, 0x50, 0x91, 0x4d, 0xa3, 0x92, 0x2a, 0x1d, 0xb7, 0xb0, 0xd1, 0x90, 0x30, 0xd4, 0x52, 0x95, - 0x1d, 0x9c, 0x12, 0x75, 0x45, 0xa4, 0xff, 0x22, 0xcf, 0x5f, 0x66, 0x28, 0x66, 0x59, 0xa6, 0x01, - 0xa5, 0x31, 0xc9, 0x3c, 0x2b, 0x76, 0x98, 0xc6, 0x0b, 0x7d, 0x5f, 0x61, 0xb1, 0xef, 0xbb, 0x97, - 0x5c, 0xca, 0x62, 0xda, 0x08, 0x27, 0x89, 0x94, 0xdc, 0x51, 0x79, 0xbf, 0x4b, 0xc9, 0xfd, 0x7e, - 0x02, 0x1b, 0xb6, 0x8b, 0xfe, 0xa6, 0xbd, 0xba, 0xec, 0x03, 0x5b, 0x8a, 0x9f, 0xf6, 0xd2, 0x4d, - 0x04, 0xa6, 0x0d, 0x39, 0x7b, 0xb8, 0xa2, 0xc3, 0x5f, 0x66, 0x65, 0x30, 0xec, 0x2e, 0x94, 0x39, - 0xde, 0xac, 0xb8, 0xeb, 0x5b, 0x57, 0x68, 0xba, 0x6e, 0x86, 0x5a, 0xdb, 0xfd, 0xb5, 0x08, 0xcd, - 0x8e, 0x10, 0x86, 0xfc, 0x46, 0x3e, 0x9e, 0xb9, 0x13, 0xb6, 0x07, 0xeb, 0xfb, 0x3c, 0xec, 0x08, - 0xa1, 0xee, 0xcc, 0xa5, 0xcc, 0x87, 0x44, 0xfc, 0xb9, 0xdb, 0xde, 0x5c, 0xfa, 0xfa, 0xd4, 0xd7, - 0xd8, 0x13, 0x00, 0xc9, 0xa4, 0x2f, 0x30, 0x96, 0xe1, 0xc5, 0xb4, 0xad, 0xa5, 0x8f, 0x12, 0x2c, - 0x33, 0xfa, 0x1a, 0x7b, 0x04, 0x8d, 0x7d, 0x1e, 0x66, 0x7a, 0xfb, 0x55, 0xec, 0xe6, 0x7c, 0x03, - 0xa9, 0xaf, 0xb1, 0xe7, 0xb0, 0xb9, 0xcf, 0xc3, 0x85, 0x06, 0x85, 0xf6, 0x36, 0xf7, 0xad, 0xdd, - 0x66, 0x59, 0x91, 0x84, 0xe9, 0x6b, 0xec, 0x15, 0x5c, 0x45, 0xf3, 0xab, 0x4a, 0xe5, 0x2a, 0xf3, - 0x57, 0x57, 0x57, 0xcc, 0x40, 0x5f, 0x63, 0x5d, 0xd8, 0x5a, 0xf9, 0xa4, 0x32, 0x6a, 0x99, 0xdf, - 0xfb, 0xda, 0xb6, 0x6b, 0xb8, 0x2c, 0x7f, 0x42, 0x90, 0x92, 0x95, 0x4f, 0xa2, 0x54, 0xf2, 0xde, - 0xd7, 0x72, 0x49, 0xc9, 0xca, 0x37, 0x8d, 0xa9, 0xe6, 0x7d, 0xfa, 0x77, 0x94, 0x7c, 0x41, 0x29, - 0x90, 0x5e, 0x1b, 0x4a, 0x81, 0x85, 0x52, 0xdf, 0x8e, 0x93, 0x5e, 0x4a, 0xf4, 0xb5, 0xd3, 0x32, - 0xfd, 0x5a, 0xf9, 0xfc, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x81, 0x6a, 0x6b, 0x76, 0x11, - 0x00, 0x00, + // 1619 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6e, 0x1b, 0x47, + 0x12, 0x16, 0xff, 0xc9, 0xa2, 0x48, 0x51, 0x6d, 0xcb, 0xa6, 0x69, 0x7b, 0x6d, 0xcf, 0xda, 0x86, + 0x80, 0x35, 0xb4, 0x5e, 0xed, 0x1a, 0x96, 0x7f, 0xe0, 0x05, 0x4d, 0x32, 0x32, 0x11, 0x89, 0x16, + 0x46, 0x12, 0x72, 0x24, 0x46, 0x9c, 0xb6, 0x32, 0x31, 0x67, 0xa6, 0x33, 0x3f, 0x0a, 0x78, 0x4c, + 0x0e, 0x79, 0x81, 0x5c, 0x73, 0xc9, 0xe3, 0xe4, 0x12, 0xe4, 0x4d, 0x72, 0xc9, 0x03, 0x04, 0x55, + 0xdd, 0x3d, 0x33, 0xfc, 0x31, 0x1c, 0x25, 0x01, 0x72, 0x9b, 0xae, 0xfe, 0xbe, 0xaa, 0xae, 0xea, + 0xea, 0xaa, 0x22, 0xa1, 0x6d, 0x09, 0x31, 0x0e, 0x62, 0x2f, 0x72, 0x5c, 0x3e, 0x0e, 0x79, 0x70, + 0xc1, 0x83, 0x1d, 0x11, 0xf8, 0x91, 0xcf, 0xf2, 0xe2, 0xcc, 0xa8, 0x40, 0x69, 0xe0, 0x8a, 0x68, + 0x66, 0xfc, 0x1b, 0x9a, 0xc7, 0x3c, 0xb8, 0x70, 0x26, 0xdc, 0xe4, 0x5f, 0xc6, 0x3c, 0x8c, 0xd8, + 0x6d, 0x80, 0x50, 0x4a, 0xc6, 0x8e, 0xdd, 0xce, 0xdd, 0xcd, 0x6d, 0xd7, 0xcc, 0x9a, 0x92, 0x0c, + 0x6d, 0x63, 0x17, 0x36, 0x14, 0x21, 0xd4, 0x8c, 0x3b, 0x50, 0x4f, 0x19, 0xa1, 0xa2, 0x40, 0x42, + 0x09, 0x8d, 0x47, 0xd0, 0x38, 0xe1, 0x9e, 0xe5, 0x45, 0x9a, 0x71, 0x13, 0x6a, 0x11, 0x09, 0x52, + 0x13, 0x55, 0x29, 0x18, 0xda, 0xc6, 0xd7, 0x39, 0x68, 0x1c, 0x47, 0x56, 0x14, 0x87, 0x87, 0x3c, + 0x0c, 0xad, 0x73, 0xce, 0x9e, 0x40, 0x39, 0x24, 0x41, 0x3b, 0x77, 0xb7, 0xb0, 0x5d, 0xdf, 0xbd, + 0xbd, 0x23, 0xce, 0x76, 0xe6, 0x20, 0x6a, 0x35, 0xf0, 0xa2, 0x60, 0x66, 0x2a, 0x70, 0xe7, 0x19, + 0xd4, 0x33, 0x62, 0xd6, 0x82, 0xc2, 0x7b, 0x3e, 0x53, 0xe6, 0xf0, 0x93, 0x5d, 0x85, 0xd2, 0x85, + 0x35, 0x8d, 0x79, 0x3b, 0x4f, 0x32, 0xb9, 0x78, 0x9e, 0xdf, 0xcb, 0x19, 0x33, 0xa8, 0xf7, 0x9d, + 0xf0, 0xbd, 0x3e, 0xc0, 0x63, 0x28, 0xd9, 0x4e, 0xf8, 0x5e, 0xdb, 0xef, 0xa0, 0xfd, 0xcc, 0x3e, + 0x7d, 0x2b, 0xe3, 0x12, 0xd8, 0xd9, 0x03, 0x48, 0x85, 0x1f, 0x33, 0x9d, 0xcb, 0x9a, 0x76, 0x61, + 0x53, 0x05, 0xb8, 0x2b, 0xc4, 0x91, 0x6f, 0x1f, 0x38, 0x61, 0xc4, 0xfe, 0x05, 0x15, 0x7f, 0x6a, + 0x1f, 0xf9, 0xb6, 0x3e, 0xc2, 0x26, 0x85, 0x20, 0x8b, 0x33, 0x35, 0x02, 0xc1, 0x1e, 0xff, 0x8a, + 0xc0, 0xf9, 0x0f, 0x82, 0x15, 0xc2, 0xf8, 0x29, 0x0f, 0x8d, 0xb9, 0xad, 0x8f, 0x24, 0x00, 0xde, + 0x9d, 0xcd, 0xc5, 0xd4, 0x9f, 0xe1, 0xae, 0x0c, 0x5c, 0x55, 0x0a, 0x86, 0x36, 0xa6, 0x82, 0xda, + 0x8c, 0x66, 0x82, 0xb7, 0x0b, 0x32, 0x15, 0xa4, 0xe8, 0x64, 0x26, 0x38, 0xbb, 0x01, 0x55, 0xe1, + 0xdb, 0x63, 0xcf, 0x72, 0x79, 0xbb, 0x48, 0xbb, 0x15, 0xe1, 0xdb, 0x23, 0xcb, 0xe5, 0x6c, 0x0b, + 0xca, 0xb8, 0xe5, 0x88, 0x76, 0x49, 0x5e, 0x87, 0xf0, 0xed, 0xa1, 0xc0, 0xe3, 0xa0, 0x58, 0x25, + 0x40, 0x59, 0x1e, 0x47, 0xf8, 0xb6, 0xbc, 0x5a, 0xd6, 0x05, 0x98, 0xf8, 0x5e, 0x64, 0x39, 0x1e, + 0x0f, 0xc2, 0x76, 0x85, 0xfc, 0xbd, 0xb7, 0xe4, 0xef, 0x4e, 0x2f, 0xc1, 0xc8, 0x6b, 0xca, 0x90, + 0x3a, 0x07, 0xb0, 0xb1, 0xb0, 0xbd, 0xe2, 0xc2, 0xfe, 0x99, 0xbd, 0xb0, 0xfa, 0x6e, 0x03, 0x4d, + 0x24, 0xac, 0xec, 0xfd, 0x9d, 0x42, 0x2d, 0x91, 0xb3, 0x07, 0xd0, 0x4c, 0x0c, 0x49, 0xa7, 0xa5, + 0xca, 0x46, 0x22, 0x25, 0xd7, 0xef, 0xc1, 0xba, 0xcb, 0x5d, 0x3f, 0x98, 0x8d, 0xa7, 0x8e, 0xeb, + 0x44, 0x64, 0xa3, 0x60, 0xd6, 0xa5, 0xec, 0x00, 0x45, 0xc6, 0x2f, 0x65, 0x80, 0xbe, 0x0c, 0xb3, + 0xf7, 0xce, 0x67, 0xb7, 0xa0, 0x86, 0xea, 0x42, 0x61, 0x4d, 0xb4, 0xce, 0x54, 0xc0, 0x0c, 0x58, + 0xc7, 0x78, 0xf1, 0x77, 0xf1, 0x94, 0x87, 0x3c, 0x52, 0xd7, 0x34, 0x27, 0x63, 0xff, 0x00, 0x75, + 0x2f, 0x2e, 0xf7, 0xa2, 0xf9, 0x9b, 0x42, 0x09, 0xa5, 0x41, 0x64, 0x05, 0xd1, 0x18, 0x2b, 0x88, + 0xba, 0xab, 0x1a, 0x49, 0x4e, 0x1c, 0x97, 0xb3, 0x47, 0x50, 0x14, 0x98, 0x61, 0x25, 0x8a, 0x78, + 0x9b, 0x5e, 0x44, 0x72, 0xbc, 0x1d, 0x4c, 0x2d, 0x19, 0x68, 0x42, 0xb1, 0x3d, 0xa8, 0xaa, 0x0c, + 0xc2, 0x2b, 0x44, 0xc6, 0xad, 0x05, 0x86, 0x2e, 0x2a, 0x92, 0x95, 0xa0, 0xd9, 0x0b, 0xa8, 0x71, + 0xcf, 0x16, 0xbe, 0xe3, 0x45, 0xfa, 0x7a, 0x6f, 0x2f, 0x50, 0x07, 0x7a, 0x5f, 0x72, 0x53, 0x3c, + 0x7b, 0x02, 0x95, 0x90, 0x4f, 0x02, 0x1e, 0x85, 0xed, 0x2a, 0x51, 0x6f, 0x2e, 0x59, 0xa5, 0x5d, + 0x49, 0xd4, 0x58, 0xb4, 0xe9, 0x78, 0xe7, 0x01, 0x0f, 0x43, 0x1e, 0xb6, 0x6b, 0x2b, 0x6d, 0x0e, + 0xf5, 0xbe, 0xb2, 0x99, 0xe0, 0x59, 0x17, 0xea, 0x01, 0x17, 0x53, 0x67, 0x62, 0x45, 0x18, 0x7a, + 0x20, 0xfa, 0x9d, 0x05, 0xba, 0x99, 0x22, 0xa4, 0x82, 0x2c, 0x87, 0x5d, 0x4b, 0xea, 0x5d, 0x9d, + 0xc2, 0xae, 0x0b, 0xda, 0x53, 0xa8, 0x25, 0x81, 0xbd, 0x4c, 0x39, 0xeb, 0xbc, 0x48, 0xde, 0xf8, + 0x1f, 0x20, 0xbf, 0x84, 0xe6, 0x7c, 0x84, 0x2f, 0xc5, 0x7e, 0x0e, 0xeb, 0xd9, 0x20, 0x5f, 0xd6, + 0xf2, 0x7c, 0x9c, 0x2f, 0xc5, 0x7e, 0x05, 0xad, 0xc5, 0x30, 0x5f, 0xaa, 0x07, 0xfc, 0x5c, 0x80, + 0xa6, 0x6e, 0x5b, 0xa1, 0x1f, 0x07, 0x13, 0x8e, 0xe5, 0x6d, 0x22, 0xe2, 0x71, 0x20, 0xdb, 0x18, + 0xa9, 0x29, 0x98, 0x30, 0x11, 0x71, 0xa6, 0xb1, 0x21, 0x20, 0xfb, 0x8a, 0xab, 0x13, 0x11, 0xd3, + 0x13, 0xc6, 0x62, 0xa0, 0x5e, 0xb9, 0x56, 0x50, 0x20, 0x44, 0x43, 0x4a, 0xb5, 0x8e, 0xc5, 0x62, + 0x50, 0x5c, 0x2a, 0x06, 0xec, 0x21, 0x6c, 0x04, 0xb1, 0xe7, 0x39, 0xde, 0xf9, 0x18, 0xdb, 0xbc, + 0x17, 0xbb, 0x54, 0x33, 0x0b, 0x66, 0x43, 0x89, 0xbb, 0x42, 0x8c, 0x62, 0x97, 0x19, 0xd0, 0x88, + 0xbd, 0x70, 0x62, 0x8f, 0xd5, 0xa9, 0xa9, 0x7c, 0x16, 0xcc, 0x3a, 0x09, 0x7b, 0x74, 0x6c, 0xd4, + 0x95, 0x62, 0xa4, 0xc5, 0x8a, 0xd4, 0xa5, 0x51, 0xd2, 0xe6, 0x36, 0xb4, 0x24, 0x2e, 0xf5, 0xa1, + 0x5d, 0x25, 0x60, 0x93, 0xe4, 0x87, 0xda, 0x09, 0xf6, 0x08, 0xd8, 0x1c, 0x52, 0x2a, 0xad, 0x11, + 0xb6, 0x95, 0xc1, 0x4a, 0xbd, 0xff, 0x81, 0xad, 0xac, 0x2f, 0xd1, 0xe7, 0x4e, 0x60, 0x93, 0x47, + 0x40, 0x04, 0x96, 0x7a, 0x74, 0x82, 0x5b, 0xe8, 0xd6, 0x53, 0x68, 0x67, 0x29, 0x8e, 0x17, 0xf1, + 0xc0, 0xb3, 0xa6, 0xc4, 0xaa, 0x13, 0x6b, 0x2b, 0x65, 0x0d, 0xd5, 0xee, 0x28, 0x76, 0x8d, 0x6f, + 0x72, 0x70, 0xa3, 0x6b, 0xdb, 0xa4, 0xe8, 0xc8, 0x0a, 0xa2, 0x59, 0x92, 0xd8, 0x78, 0x6e, 0x06, + 0xc5, 0x38, 0x4e, 0x5a, 0x1e, 0x7d, 0x63, 0xc2, 0x84, 0x49, 0x9f, 0xc3, 0x4f, 0xd6, 0x84, 0xbc, + 0x23, 0x54, 0xbd, 0xcc, 0x3b, 0x02, 0x59, 0xc2, 0x0f, 0xe4, 0x35, 0x95, 0x4c, 0xfa, 0xc6, 0x34, + 0x70, 0xc2, 0xb1, 0xef, 0x4d, 0x1d, 0x8f, 0xd3, 0xcd, 0x54, 0xcd, 0xaa, 0x13, 0xbe, 0xa5, 0x35, + 0x1d, 0xe2, 0x54, 0xfc, 0xcd, 0x87, 0xe8, 0xc2, 0x8d, 0x3e, 0x9f, 0xfe, 0x99, 0x33, 0x18, 0xdf, + 0xe5, 0x80, 0x2d, 0x2b, 0xf8, 0x0b, 0x1d, 0x48, 0xcb, 0x60, 0x29, 0x5b, 0x06, 0xe7, 0x1d, 0x2b, + 0x2f, 0x38, 0xf6, 0x7f, 0xb8, 0xb2, 0xc2, 0x2b, 0xb6, 0x0d, 0x05, 0xff, 0xec, 0x0b, 0x35, 0x3c, + 0x5d, 0xc3, 0x6a, 0xbc, 0x8c, 0x32, 0x11, 0x62, 0xdc, 0x87, 0x16, 0x8e, 0x5c, 0x58, 0x68, 0x5f, + 0xcf, 0x8e, 0x87, 0x7d, 0x0c, 0x88, 0x3a, 0x7f, 0x2e, 0x75, 0xfe, 0x15, 0x6c, 0xec, 0x73, 0x04, + 0xf5, 0x79, 0x64, 0x39, 0xd3, 0x95, 0xa0, 0xb9, 0x61, 0x27, 0x3f, 0x37, 0xec, 0x18, 0x67, 0x50, + 0x3d, 0xf2, 0xed, 0xc1, 0x05, 0x97, 0x11, 0xa3, 0x69, 0x49, 0x45, 0x0c, 0xbf, 0xd1, 0xf7, 0x80, + 0x5b, 0xa1, 0xef, 0x29, 0xa2, 0x5a, 0xa1, 0x11, 0xeb, 0x5c, 0x0f, 0x56, 0xf8, 0xc9, 0xda, 0x50, + 0x71, 0xe5, 0x18, 0xaa, 0xc2, 0xa4, 0x97, 0xc6, 0x0f, 0x79, 0xea, 0x17, 0x6a, 0x50, 0x7a, 0x98, + 0xb1, 0xd2, 0xdc, 0x65, 0x18, 0x82, 0x64, 0x73, 0x07, 0x67, 0xb3, 0x8f, 0x58, 0xce, 0xd8, 0x29, + 0xcc, 0xd9, 0x41, 0x86, 0x65, 0x63, 0x73, 0x51, 0x53, 0x82, 0x5a, 0xa1, 0xfb, 0xa8, 0x71, 0x1c, + 0x46, 0x81, 0x3e, 0x1a, 0xae, 0x8f, 0xa3, 0xc0, 0xf8, 0x36, 0x07, 0x45, 0x9a, 0x07, 0xeb, 0x50, + 0x39, 0x1a, 0x8c, 0xfa, 0xc3, 0xd1, 0x7e, 0x6b, 0x0d, 0x17, 0xe6, 0xe9, 0x68, 0x84, 0x8b, 0x1c, + 0x6b, 0x40, 0xed, 0xf8, 0xb4, 0xd7, 0x1b, 0x0c, 0xfa, 0x83, 0x7e, 0x2b, 0xcf, 0x00, 0xca, 0x9f, + 0x74, 0x87, 0x07, 0x83, 0x7e, 0xab, 0x80, 0xb8, 0xd3, 0xd1, 0xa7, 0xa3, 0xb7, 0x9f, 0x8d, 0x5a, + 0x45, 0xd6, 0x04, 0x38, 0x19, 0x1c, 0x0e, 0x47, 0xdd, 0x13, 0xe4, 0x95, 0xd8, 0x3a, 0x54, 0xbb, + 0xaf, 0x47, 0x6f, 0xcd, 0xc3, 0xee, 0x41, 0xab, 0x8c, 0xbb, 0xc3, 0xd1, 0xf0, 0x64, 0x28, 0x77, + 0x2b, 0xb8, 0x3e, 0xee, 0xbd, 0x19, 0xf4, 0x4f, 0x0f, 0x70, 0x5d, 0x35, 0x7e, 0xcd, 0xc1, 0xfa, + 0x91, 0x6f, 0xa7, 0x13, 0xdb, 0x55, 0x28, 0x39, 0x2e, 0x3a, 0x29, 0x6f, 0x43, 0x2e, 0x50, 0x4a, + 0xc3, 0x93, 0xee, 0x12, 0xb4, 0xc8, 0x84, 0xaa, 0xb0, 0x18, 0x2a, 0x1a, 0x94, 0xb8, 0xad, 0x67, + 0x5c, 0xb5, 0xc4, 0xda, 0x4e, 0xd5, 0x50, 0x95, 0x46, 0x15, 0x96, 0x3a, 0xc9, 0x64, 0x51, 0xc4, + 0xec, 0x96, 0x90, 0x89, 0x88, 0xd5, 0xb8, 0x5b, 0x25, 0x41, 0x4f, 0xc4, 0xd8, 0x42, 0x54, 0xef, + 0xd0, 0x1a, 0x2a, 0x72, 0x9e, 0x54, 0x52, 0xa5, 0xe3, 0x0e, 0xce, 0x20, 0x12, 0x86, 0x5a, 0xaa, + 0x72, 0xb8, 0x53, 0xa2, 0x9e, 0x88, 0x8d, 0xef, 0x65, 0x6a, 0xc8, 0xe4, 0xc5, 0x04, 0xcc, 0xcc, + 0xa6, 0xf4, 0x4d, 0x32, 0xdf, 0xd6, 0x0e, 0xd3, 0xf7, 0xc2, 0x48, 0x58, 0x58, 0x1c, 0x09, 0x1f, + 0x24, 0xef, 0xb5, 0x98, 0xce, 0xc8, 0x49, 0x8e, 0x25, 0xcf, 0x57, 0x3e, 0xfd, 0x52, 0xf2, 0xf4, + 0x9f, 0xc1, 0x86, 0xe3, 0xa1, 0xbf, 0xe9, 0x18, 0x2f, 0x47, 0xc4, 0x96, 0xe2, 0xa7, 0x63, 0x76, + 0x13, 0x81, 0xe9, 0xac, 0xce, 0x1e, 0xaf, 0x18, 0xfe, 0x97, 0x59, 0x19, 0x0c, 0xbb, 0x0f, 0x65, + 0x8e, 0x8f, 0x4e, 0x0f, 0x84, 0xeb, 0x0a, 0x4d, 0x2f, 0xd1, 0x54, 0x7b, 0xbb, 0x3f, 0x16, 0xa1, + 0xd9, 0x15, 0xc2, 0x94, 0x3f, 0x9f, 0x8f, 0x67, 0xde, 0x84, 0xed, 0xc1, 0xfa, 0x3e, 0x8f, 0xba, + 0x42, 0xa8, 0xe7, 0x74, 0x25, 0xf3, 0x1b, 0x43, 0xff, 0x12, 0xee, 0x6c, 0x2e, 0xfd, 0x30, 0x35, + 0xd6, 0xd8, 0x33, 0x00, 0xc9, 0xa4, 0x1f, 0x67, 0x2c, 0xc3, 0xd3, 0xb4, 0xad, 0xa5, 0xdf, 0x2b, + 0x58, 0x81, 0x8c, 0x35, 0xf6, 0x04, 0x1a, 0xfb, 0x3c, 0xca, 0x8c, 0xfd, 0xab, 0xd8, 0xcd, 0xf9, + 0xd9, 0xd2, 0x58, 0x63, 0x2f, 0x61, 0x73, 0x9f, 0x47, 0x0b, 0xb3, 0x0b, 0x9d, 0x6d, 0xee, 0x67, + 0x78, 0x87, 0x65, 0x45, 0x12, 0x66, 0xac, 0xb1, 0x37, 0x70, 0x1d, 0xcd, 0xaf, 0xaa, 0xa2, 0xab, + 0xcc, 0x5f, 0x5f, 0x5d, 0x4c, 0x43, 0x63, 0x8d, 0xf5, 0x60, 0x6b, 0x65, 0xb7, 0x65, 0x34, 0x4d, + 0x7f, 0xb0, 0x11, 0x77, 0x6a, 0xb8, 0x2d, 0xff, 0x9f, 0x20, 0x25, 0x2b, 0xbb, 0xa5, 0x54, 0xf2, + 0xc1, 0x46, 0xba, 0xa4, 0x64, 0x65, 0xbb, 0x63, 0x6a, 0xae, 0x9f, 0xfe, 0x1e, 0x25, 0xff, 0xa3, + 0x14, 0x48, 0x9f, 0x0d, 0xa5, 0xc0, 0x42, 0x17, 0xe8, 0xe8, 0xa4, 0x97, 0x12, 0x63, 0xed, 0xac, + 0x4c, 0xff, 0xba, 0xfc, 0xf7, 0xb7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x28, 0x09, 0xde, 0x91, + 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/worker/server/pb/app_runtime_server.proto b/worker/server/pb/app_runtime_server.proto index 4ac6c0098..10f9eae2b 100644 --- a/worker/server/pb/app_runtime_server.proto +++ b/worker/server/pb/app_runtime_server.proto @@ -159,6 +159,7 @@ message PodStatus { string reason = 2; string message = 3; string advice = 4; + string type_str = 5; } message PodContainer { diff --git a/worker/server/pod.go b/worker/server/pod.go index 58a4c91f7..aa75e1de3 100644 --- a/worker/server/pod.go +++ b/worker/server/pod.go @@ -4,12 +4,12 @@ import ( "context" "errors" "fmt" - "github.com/goodrain/rainbond/worker/util" "sort" "time" "github.com/Sirupsen/logrus" "github.com/goodrain/rainbond/worker/server/pb" + "github.com/goodrain/rainbond/worker/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -42,6 +42,7 @@ func (r *RuntimeServer) GetPodDetail(ctx context.Context, req *pb.GetPodDetailRe podDetail.StartTime = pod.Status.StartTime.Time.Format(time.RFC3339) podDetail.InitContainers = make([]*pb.PodContainer, len(pod.Spec.InitContainers)) podDetail.Containers = make([]*pb.PodContainer, len(pod.Spec.Containers)) + podDetail.Status = &pb.PodStatus{} podDetail.Events = []*pb.PodEvent{} if pod.Spec.NodeName != "" { diff --git a/worker/util/pod.go b/worker/util/pod.go index c6d006588..5ff4e2ea7 100644 --- a/worker/util/pod.go +++ b/worker/util/pod.go @@ -45,4 +45,5 @@ func DescribePodStatus(pod *corev1.Pod, podStatus *pb.PodStatus) { } // TODO: advice } + podStatus.TypeStr = podStatus.Type.String() }