diff --git a/pkg/apiclient/rollout/rollout.pb.go b/pkg/apiclient/rollout/rollout.pb.go index 7004cf2767..4d85b56746 100644 --- a/pkg/apiclient/rollout/rollout.pb.go +++ b/pkg/apiclient/rollout/rollout.pb.go @@ -1380,7 +1380,7 @@ func (m *JobInfo) GetStartedAt() *v1.Time { return nil } -type AnalysisRunSpecAndStatus struct { +type SpecAndStatus struct { Spec *v1alpha1.AnalysisRunSpec `protobuf:"bytes,1,opt,name=spec,proto3" json:"spec,omitempty"` Status *v1alpha1.AnalysisRunStatus `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1388,18 +1388,18 @@ type AnalysisRunSpecAndStatus struct { XXX_sizecache int32 `json:"-"` } -func (m *AnalysisRunSpecAndStatus) Reset() { *m = AnalysisRunSpecAndStatus{} } -func (m *AnalysisRunSpecAndStatus) String() string { return proto.CompactTextString(m) } -func (*AnalysisRunSpecAndStatus) ProtoMessage() {} -func (*AnalysisRunSpecAndStatus) Descriptor() ([]byte, []int) { +func (m *SpecAndStatus) Reset() { *m = SpecAndStatus{} } +func (m *SpecAndStatus) String() string { return proto.CompactTextString(m) } +func (*SpecAndStatus) ProtoMessage() {} +func (*SpecAndStatus) Descriptor() ([]byte, []int) { return fileDescriptor_99101d942e8912a7, []int{18} } -func (m *AnalysisRunSpecAndStatus) XXX_Unmarshal(b []byte) error { +func (m *SpecAndStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *AnalysisRunSpecAndStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpecAndStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_AnalysisRunSpecAndStatus.Marshal(b, m, deterministic) + return xxx_messageInfo_SpecAndStatus.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1409,26 +1409,26 @@ func (m *AnalysisRunSpecAndStatus) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *AnalysisRunSpecAndStatus) XXX_Merge(src proto.Message) { - xxx_messageInfo_AnalysisRunSpecAndStatus.Merge(m, src) +func (m *SpecAndStatus) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpecAndStatus.Merge(m, src) } -func (m *AnalysisRunSpecAndStatus) XXX_Size() int { +func (m *SpecAndStatus) XXX_Size() int { return m.Size() } -func (m *AnalysisRunSpecAndStatus) XXX_DiscardUnknown() { - xxx_messageInfo_AnalysisRunSpecAndStatus.DiscardUnknown(m) +func (m *SpecAndStatus) XXX_DiscardUnknown() { + xxx_messageInfo_SpecAndStatus.DiscardUnknown(m) } -var xxx_messageInfo_AnalysisRunSpecAndStatus proto.InternalMessageInfo +var xxx_messageInfo_SpecAndStatus proto.InternalMessageInfo -func (m *AnalysisRunSpecAndStatus) GetSpec() *v1alpha1.AnalysisRunSpec { +func (m *SpecAndStatus) GetSpec() *v1alpha1.AnalysisRunSpec { if m != nil { return m.Spec } return nil } -func (m *AnalysisRunSpecAndStatus) GetStatus() *v1alpha1.AnalysisRunStatus { +func (m *SpecAndStatus) GetStatus() *v1alpha1.AnalysisRunStatus { if m != nil { return m.Status } @@ -1436,21 +1436,24 @@ func (m *AnalysisRunSpecAndStatus) GetStatus() *v1alpha1.AnalysisRunStatus { } type AnalysisRunInfo struct { - ObjectMeta *v1.ObjectMeta `protobuf:"bytes,1,opt,name=objectMeta,proto3" json:"objectMeta,omitempty"` - Icon string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon,omitempty"` - Revision int64 `protobuf:"varint,3,opt,name=revision,proto3" json:"revision,omitempty"` - Status string `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"` - Successful int32 `protobuf:"varint,5,opt,name=successful,proto3" json:"successful,omitempty"` - Failed int32 `protobuf:"varint,6,opt,name=failed,proto3" json:"failed,omitempty"` - Inconclusive int32 `protobuf:"varint,7,opt,name=inconclusive,proto3" json:"inconclusive,omitempty"` - Error int32 `protobuf:"varint,8,opt,name=error,proto3" json:"error,omitempty"` - Jobs []*JobInfo `protobuf:"bytes,9,rep,name=jobs,proto3" json:"jobs,omitempty"` - NonJobInfo []*NonJobInfo `protobuf:"bytes,10,rep,name=nonJobInfo,proto3" json:"nonJobInfo,omitempty"` - Metrics []*Metrics `protobuf:"bytes,11,rep,name=metrics,proto3" json:"metrics,omitempty"` - AnalysisRunSpecAndStatus *AnalysisRunSpecAndStatus `protobuf:"bytes,12,opt,name=analysisRunSpecAndStatus,proto3" json:"analysisRunSpecAndStatus,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ObjectMeta *v1.ObjectMeta `protobuf:"bytes,1,opt,name=objectMeta,proto3" json:"objectMeta,omitempty"` + // + //type from 161 -178 will be deprecated in future. + Icon string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon,omitempty"` + Revision int64 `protobuf:"varint,3,opt,name=revision,proto3" json:"revision,omitempty"` + Status string `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"` + Successful int32 `protobuf:"varint,5,opt,name=successful,proto3" json:"successful,omitempty"` + Failed int32 `protobuf:"varint,6,opt,name=failed,proto3" json:"failed,omitempty"` + Inconclusive int32 `protobuf:"varint,7,opt,name=inconclusive,proto3" json:"inconclusive,omitempty"` + Error int32 `protobuf:"varint,8,opt,name=error,proto3" json:"error,omitempty"` + Jobs []*JobInfo `protobuf:"bytes,9,rep,name=jobs,proto3" json:"jobs,omitempty"` + NonJobInfo []*NonJobInfo `protobuf:"bytes,10,rep,name=nonJobInfo,proto3" json:"nonJobInfo,omitempty"` + Metrics []*Metrics `protobuf:"bytes,11,rep,name=metrics,proto3" json:"metrics,omitempty"` + // The new API changes should use SpecAndStatus. + SpecAndStatus *SpecAndStatus `protobuf:"bytes,12,opt,name=specAndStatus,proto3" json:"specAndStatus,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *AnalysisRunInfo) Reset() { *m = AnalysisRunInfo{} } @@ -1563,9 +1566,9 @@ func (m *AnalysisRunInfo) GetMetrics() []*Metrics { return nil } -func (m *AnalysisRunInfo) GetAnalysisRunSpecAndStatus() *AnalysisRunSpecAndStatus { +func (m *AnalysisRunInfo) GetSpecAndStatus() *SpecAndStatus { if m != nil { - return m.AnalysisRunSpecAndStatus + return m.SpecAndStatus } return nil } @@ -1739,7 +1742,7 @@ func init() { proto.RegisterType((*PodInfo)(nil), "rollout.PodInfo") proto.RegisterType((*ContainerInfo)(nil), "rollout.ContainerInfo") proto.RegisterType((*JobInfo)(nil), "rollout.JobInfo") - proto.RegisterType((*AnalysisRunSpecAndStatus)(nil), "rollout.AnalysisRunSpecAndStatus") + proto.RegisterType((*SpecAndStatus)(nil), "rollout.SpecAndStatus") proto.RegisterType((*AnalysisRunInfo)(nil), "rollout.AnalysisRunInfo") proto.RegisterType((*NonJobInfo)(nil), "rollout.NonJobInfo") proto.RegisterType((*Metrics)(nil), "rollout.Metrics") @@ -1750,121 +1753,121 @@ func init() { } var fileDescriptor_99101d942e8912a7 = []byte{ - // 1821 bytes of a gzipped FileDescriptorProto + // 1815 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4f, 0x6f, 0x1c, 0x49, - 0x15, 0x57, 0x7b, 0x3c, 0xf6, 0xf8, 0x8d, 0xff, 0x96, 0xb3, 0xd9, 0xde, 0xd9, 0x60, 0x79, 0x7b, - 0x91, 0x70, 0x0c, 0x74, 0x3b, 0xde, 0x28, 0xcb, 0xf2, 0xe7, 0x60, 0x12, 0xcb, 0x1b, 0x94, 0xec, - 0x86, 0x36, 0xb0, 0x02, 0x69, 0x89, 0xca, 0x3d, 0xe5, 0x71, 0x27, 0x3d, 0x5d, 0x4d, 0x57, 0xf5, - 0x84, 0x91, 0xe5, 0x03, 0xf0, 0x01, 0x38, 0xf0, 0x15, 0x90, 0x10, 0x27, 0x84, 0xc4, 0x85, 0x03, - 0x57, 0xc4, 0x11, 0x89, 0x2f, 0x80, 0x22, 0x84, 0xc4, 0x91, 0x0b, 0x67, 0x54, 0xaf, 0xab, 0xab, - 0xff, 0x78, 0x26, 0x71, 0x64, 0x43, 0x72, 0x9a, 0x7e, 0xef, 0xd5, 0x7b, 0xef, 0x57, 0x55, 0xef, - 0xbd, 0xaa, 0x7a, 0x03, 0xef, 0x27, 0x4f, 0x07, 0x1e, 0x4d, 0xc2, 0x20, 0x0a, 0x59, 0x2c, 0xbd, - 0x94, 0x47, 0x11, 0xcf, 0xcc, 0xaf, 0x9b, 0xa4, 0x5c, 0x72, 0x32, 0xaf, 0xc9, 0xde, 0x8d, 0x01, - 0xe7, 0x83, 0x88, 0x29, 0x05, 0x8f, 0xc6, 0x31, 0x97, 0x54, 0x86, 0x3c, 0x16, 0xf9, 0xb0, 0xde, - 0x83, 0x41, 0x28, 0x4f, 0xb2, 0x23, 0x37, 0xe0, 0x43, 0x8f, 0xa6, 0x03, 0x9e, 0xa4, 0xfc, 0x09, - 0x7e, 0x7c, 0x55, 0xeb, 0x0b, 0x4f, 0x7b, 0x13, 0x9e, 0xe1, 0x8c, 0x6e, 0xd1, 0x28, 0x39, 0xa1, - 0xb7, 0xbc, 0x01, 0x8b, 0x59, 0x4a, 0x25, 0xeb, 0x6b, 0x6b, 0xb7, 0x9f, 0x7e, 0x4d, 0xb8, 0x21, - 0x57, 0xc3, 0x87, 0x34, 0x38, 0x09, 0x63, 0x96, 0x8e, 0x4b, 0xfd, 0x21, 0x93, 0xd4, 0x1b, 0x9d, - 0xd7, 0x7a, 0x57, 0x23, 0x44, 0xea, 0x28, 0x3b, 0xf6, 0xd8, 0x30, 0x91, 0xe3, 0x5c, 0xe8, 0xdc, - 0x83, 0x55, 0x3f, 0xf7, 0x7b, 0x3f, 0x3e, 0xe6, 0xdf, 0xcd, 0x58, 0x3a, 0x26, 0x04, 0x66, 0x63, - 0x3a, 0x64, 0xb6, 0xb5, 0x69, 0x6d, 0x2d, 0xf8, 0xf8, 0x4d, 0x6e, 0xc0, 0x82, 0xfa, 0x15, 0x09, - 0x0d, 0x98, 0x3d, 0x83, 0x82, 0x92, 0xe1, 0xdc, 0x86, 0x6b, 0x15, 0x2b, 0x0f, 0x42, 0x21, 0x73, - 0x4b, 0x35, 0x2d, 0xab, 0xa9, 0xf5, 0x4b, 0x0b, 0x56, 0x0e, 0x99, 0xbc, 0x3f, 0xa4, 0x03, 0xe6, - 0xb3, 0x9f, 0x64, 0x4c, 0x48, 0x62, 0x43, 0xb1, 0xb2, 0x7a, 0x7c, 0x41, 0x2a, 0x5b, 0x01, 0x8f, - 0x25, 0x55, 0xb3, 0x2e, 0x10, 0x18, 0x06, 0xb9, 0x06, 0xed, 0x50, 0xd9, 0xb1, 0x5b, 0x28, 0xc9, - 0x09, 0xb2, 0x0a, 0x2d, 0x49, 0x07, 0xf6, 0x2c, 0xf2, 0xd4, 0x67, 0x1d, 0x51, 0xbb, 0x89, 0xe8, - 0x04, 0xc8, 0xf7, 0xe3, 0x3e, 0xd7, 0x73, 0x79, 0x39, 0xa6, 0x1e, 0x74, 0x52, 0x36, 0x0a, 0x45, - 0xc8, 0x63, 0x84, 0xd4, 0xf2, 0x0d, 0x5d, 0xf7, 0xd4, 0x6a, 0x7a, 0xba, 0x0f, 0x6f, 0xf9, 0x4c, - 0x48, 0x9a, 0xca, 0x86, 0xb3, 0x57, 0x5f, 0xfc, 0xcf, 0xe1, 0xad, 0x47, 0x29, 0x1f, 0x72, 0xc9, - 0x2e, 0x6b, 0x4a, 0x69, 0x1c, 0x67, 0x51, 0x84, 0x70, 0x3b, 0x3e, 0x7e, 0x3b, 0x07, 0xb0, 0xbe, - 0x77, 0xc4, 0xaf, 0x00, 0xe7, 0x01, 0xac, 0xfb, 0x4c, 0xa6, 0xe3, 0x4b, 0x1b, 0x7a, 0x0c, 0x6b, - 0xda, 0xc6, 0x67, 0x54, 0x06, 0x27, 0xfb, 0x23, 0x16, 0xa3, 0x19, 0x39, 0x4e, 0x8c, 0x19, 0xf5, - 0x4d, 0xee, 0x40, 0x37, 0x2d, 0xc3, 0x12, 0x0d, 0x75, 0x77, 0xaf, 0xb9, 0x45, 0x26, 0x57, 0x42, - 0xd6, 0xaf, 0x0e, 0x74, 0x1e, 0xc3, 0xd2, 0x27, 0x85, 0x37, 0xc5, 0x78, 0x71, 0x1c, 0x93, 0x1d, - 0x58, 0xa7, 0x23, 0x1a, 0x46, 0xf4, 0x28, 0x62, 0x46, 0x4f, 0xd8, 0x33, 0x9b, 0xad, 0xad, 0x05, - 0x7f, 0x92, 0xc8, 0xb9, 0x0b, 0x2b, 0x8d, 0x7c, 0x21, 0x3b, 0xd0, 0x29, 0x0a, 0x80, 0x6d, 0x6d, - 0xb6, 0xa6, 0x02, 0x35, 0xa3, 0x9c, 0x0f, 0xa1, 0xfb, 0x03, 0x96, 0xaa, 0x58, 0x43, 0x8c, 0x5b, - 0xb0, 0x52, 0x88, 0x34, 0x5b, 0x23, 0x6d, 0xb2, 0x9d, 0xdf, 0xcc, 0x41, 0xb7, 0x62, 0x92, 0x3c, - 0x02, 0xe0, 0x47, 0x4f, 0x58, 0x20, 0x1f, 0x32, 0x49, 0x51, 0xa9, 0xbb, 0xbb, 0xe3, 0xe6, 0xb5, - 0xc6, 0xad, 0xd6, 0x1a, 0x37, 0x79, 0x3a, 0x50, 0x0c, 0xe1, 0xaa, 0x5a, 0xe3, 0x8e, 0x6e, 0xb9, - 0x9f, 0x1a, 0x3d, 0xbf, 0x62, 0x83, 0x5c, 0x87, 0x39, 0x21, 0xa9, 0xcc, 0x84, 0xde, 0x3c, 0x4d, - 0xa9, 0x4c, 0x1a, 0x32, 0x21, 0xca, 0x3c, 0x2d, 0x48, 0xb5, 0x7d, 0x61, 0xc0, 0x63, 0x9d, 0xaa, - 0xf8, 0xad, 0xb2, 0x4b, 0x48, 0x55, 0xc9, 0x06, 0x63, 0x9d, 0xaa, 0x86, 0x56, 0xe3, 0x85, 0x64, - 0x89, 0x3d, 0x97, 0x8f, 0x57, 0xdf, 0x6a, 0x97, 0x04, 0x93, 0x9f, 0xb1, 0x70, 0x70, 0x22, 0xed, - 0xf9, 0x7c, 0x97, 0x0c, 0x83, 0x38, 0xb0, 0x48, 0x03, 0x99, 0xd1, 0x48, 0x0f, 0xe8, 0xe0, 0x80, - 0x1a, 0x4f, 0x55, 0x91, 0x94, 0xd1, 0xfe, 0xd8, 0x5e, 0xd8, 0xb4, 0xb6, 0xda, 0x7e, 0x4e, 0x28, - 0xd4, 0x41, 0x96, 0xa6, 0x2c, 0x96, 0x36, 0x20, 0xbf, 0x20, 0x95, 0xa4, 0xcf, 0x44, 0x98, 0xb2, - 0xbe, 0xdd, 0xcd, 0x25, 0x9a, 0x54, 0x92, 0x2c, 0xe9, 0xab, 0x2a, 0x6c, 0x2f, 0xe6, 0x12, 0x4d, - 0x2a, 0x94, 0x26, 0x24, 0xec, 0x25, 0x94, 0x95, 0x0c, 0xb2, 0x09, 0xdd, 0x34, 0xaf, 0x0b, 0xac, - 0xbf, 0x27, 0xed, 0x65, 0x04, 0x59, 0x65, 0x91, 0x0d, 0x00, 0x5d, 0xe1, 0xd5, 0x16, 0xaf, 0xe0, - 0x80, 0x0a, 0x87, 0x7c, 0xa4, 0x2c, 0x24, 0x51, 0x18, 0xd0, 0x43, 0x26, 0x85, 0xbd, 0x8a, 0xb1, - 0xf4, 0x76, 0x19, 0x4b, 0x46, 0xa6, 0xe3, 0xbe, 0x1c, 0xab, 0x54, 0xd9, 0x4f, 0x13, 0x96, 0x86, - 0x43, 0x16, 0x4b, 0x61, 0xaf, 0x35, 0x54, 0xf7, 0x8d, 0x2c, 0x57, 0xad, 0x8c, 0x25, 0xdf, 0x84, - 0x45, 0x1a, 0xd3, 0x68, 0x2c, 0x42, 0xe1, 0x67, 0xb1, 0xb0, 0x09, 0xea, 0xda, 0x46, 0x77, 0xaf, - 0x14, 0xa2, 0x72, 0x6d, 0x34, 0xb9, 0x03, 0x60, 0x4a, 0xb9, 0xb0, 0xd7, 0x51, 0xf7, 0xba, 0xd1, - 0xbd, 0x5b, 0x88, 0x50, 0xb3, 0x32, 0x92, 0xfc, 0x18, 0xda, 0x6a, 0xe7, 0x85, 0x7d, 0x0d, 0x55, - 0x3e, 0x76, 0xcb, 0xe3, 0xd6, 0x2d, 0x8e, 0x5b, 0xfc, 0x78, 0x5c, 0xe4, 0x40, 0x19, 0xc2, 0x86, - 0x53, 0x1c, 0xb7, 0xee, 0x5d, 0x1a, 0xd3, 0x74, 0x7c, 0x28, 0x59, 0xe2, 0xe7, 0x66, 0x9d, 0x3f, - 0xcd, 0xc0, 0x72, 0x7d, 0xd6, 0xff, 0x83, 0x64, 0x29, 0x42, 0x7f, 0xa6, 0x1e, 0xfa, 0xe6, 0x60, - 0x69, 0x35, 0x0e, 0x96, 0x32, 0xb9, 0x66, 0xa7, 0x25, 0x57, 0xbb, 0x9e, 0x5c, 0x8d, 0x90, 0x98, - 0x7b, 0x85, 0x90, 0x68, 0xee, 0xeb, 0xfc, 0xab, 0xec, 0xab, 0xf3, 0x9f, 0x16, 0x2c, 0xd7, 0xad, - 0xff, 0x1f, 0x8b, 0x4d, 0xb1, 0xae, 0xad, 0x29, 0xeb, 0x3a, 0x3b, 0x71, 0x5d, 0x55, 0x56, 0xb6, - 0xf1, 0xf8, 0xd3, 0x94, 0xe2, 0x07, 0x18, 0x19, 0x58, 0x6c, 0x3a, 0xbe, 0xa6, 0x14, 0x9f, 0x06, - 0x32, 0x1c, 0x31, 0xac, 0x35, 0x1d, 0x5f, 0x53, 0x6a, 0x1f, 0x12, 0x65, 0x94, 0x3d, 0xc3, 0x1a, - 0xd3, 0xf1, 0x0b, 0x32, 0xf7, 0x8e, 0xab, 0x21, 0x74, 0x85, 0x31, 0x74, 0xbd, 0x2c, 0x40, 0xb3, - 0x2c, 0xf4, 0xa0, 0x23, 0xd9, 0x30, 0x89, 0xa8, 0x64, 0x58, 0x69, 0x16, 0x7c, 0x43, 0x93, 0xaf, - 0xc0, 0x9a, 0x08, 0x68, 0xc4, 0xee, 0xf1, 0x67, 0xf1, 0x3d, 0x46, 0xfb, 0x51, 0x18, 0x33, 0x2c, - 0x3a, 0x0b, 0xfe, 0x79, 0x81, 0x42, 0x8d, 0x77, 0x23, 0x61, 0x2f, 0xe1, 0xf9, 0xa4, 0x29, 0xf2, - 0x45, 0x98, 0x4d, 0x78, 0x5f, 0xd8, 0xcb, 0xb8, 0xc1, 0xab, 0x66, 0x83, 0x1f, 0xf1, 0x3e, 0x6e, - 0x2c, 0x4a, 0xd5, 0x9a, 0x26, 0x61, 0x3c, 0xc0, 0xb2, 0xd3, 0xf1, 0xf1, 0x1b, 0x79, 0x3c, 0x1e, - 0xd8, 0xab, 0x9a, 0xc7, 0xe3, 0x81, 0xf3, 0x47, 0x0b, 0xe6, 0xb5, 0xe6, 0x6b, 0xde, 0x71, 0x53, - 0xd2, 0xf3, 0x64, 0xd1, 0x25, 0x1d, 0x77, 0x02, 0x6b, 0xaa, 0xc0, 0xdd, 0xc6, 0x9d, 0xc8, 0x69, - 0xe7, 0x23, 0x58, 0xaa, 0x55, 0x9c, 0x89, 0x37, 0x14, 0x73, 0xdf, 0x9c, 0xa9, 0xdc, 0x37, 0x9d, - 0x7f, 0x5b, 0x30, 0xff, 0x1d, 0x7e, 0xf4, 0x06, 0x4c, 0x7b, 0x03, 0x60, 0xc8, 0x64, 0x1a, 0x06, - 0xea, 0xd6, 0xa1, 0xe7, 0x5e, 0xe1, 0x90, 0x8f, 0x61, 0xa1, 0x3c, 0x65, 0xda, 0x08, 0x6e, 0xfb, - 0x62, 0xe0, 0xbe, 0x17, 0x0e, 0x99, 0x5f, 0x2a, 0x3b, 0xff, 0xb4, 0xc0, 0xae, 0x54, 0x81, 0xc3, - 0x84, 0x05, 0x7b, 0x71, 0xff, 0x30, 0x87, 0x46, 0x61, 0x56, 0x24, 0x2c, 0xd0, 0xd3, 0x7f, 0x78, - 0xb9, 0xfa, 0xdc, 0xf0, 0xe2, 0xa3, 0x69, 0x32, 0xa8, 0xad, 0x4a, 0x77, 0xf7, 0xd3, 0xab, 0x73, - 0x82, 0x66, 0x8b, 0x65, 0x76, 0x7e, 0x31, 0x0b, 0x2b, 0x8d, 0x72, 0xf7, 0x06, 0x9f, 0x06, 0x1b, - 0x00, 0x22, 0x0b, 0x02, 0x26, 0xc4, 0x71, 0x16, 0xe9, 0x18, 0xaf, 0x70, 0x94, 0xde, 0x31, 0x0d, - 0x23, 0xd6, 0xc7, 0xaa, 0xd6, 0xf6, 0x35, 0xa5, 0xae, 0x49, 0x61, 0x1c, 0xf0, 0x38, 0x88, 0x32, - 0x51, 0xd4, 0xb6, 0xb6, 0x5f, 0xe3, 0xa9, 0xe0, 0x67, 0x69, 0xca, 0x53, 0xac, 0x6f, 0x6d, 0x3f, - 0x27, 0x54, 0x05, 0x79, 0xc2, 0x8f, 0x54, 0x65, 0xab, 0x57, 0x10, 0x9d, 0x10, 0x3e, 0x4a, 0xc9, - 0x07, 0x00, 0x31, 0x8f, 0x35, 0xcf, 0x06, 0x1c, 0xbb, 0x6e, 0xc6, 0x7e, 0x62, 0x44, 0x7e, 0x65, - 0x18, 0xd9, 0x56, 0x47, 0x9b, 0x8a, 0x5d, 0x61, 0x77, 0x1b, 0xd6, 0x1f, 0xe6, 0x7c, 0xbf, 0x18, - 0x40, 0x3e, 0x07, 0x9b, 0x4e, 0x09, 0x47, 0xac, 0x8a, 0xdd, 0xdd, 0xf7, 0x26, 0x9d, 0x5e, 0xb5, - 0x81, 0xfe, 0x54, 0x13, 0xce, 0xaf, 0x2d, 0x80, 0x12, 0xa5, 0x5a, 0x8a, 0x11, 0x8d, 0xb2, 0xa2, - 0x38, 0xe4, 0xc4, 0xd4, 0x4c, 0xad, 0x67, 0x65, 0xeb, 0xc5, 0x59, 0x39, 0x7b, 0x99, 0xac, 0xfc, - 0xbd, 0x05, 0xf3, 0x7a, 0x69, 0x26, 0xd6, 0xaf, 0x6d, 0x58, 0xd5, 0xc1, 0x70, 0x97, 0xc7, 0xfd, - 0x50, 0x86, 0x26, 0xe4, 0xce, 0xf1, 0xd5, 0x1c, 0x03, 0x9e, 0xc5, 0x12, 0x01, 0xb7, 0xfd, 0x9c, - 0x50, 0xc7, 0x4e, 0x35, 0x28, 0x1e, 0x84, 0xc3, 0x30, 0xc7, 0xdc, 0xf6, 0xcf, 0x0b, 0x54, 0x58, - 0xa9, 0x00, 0xcb, 0x52, 0x3d, 0x30, 0x0f, 0xc8, 0x1a, 0x6f, 0xf7, 0x5f, 0x4b, 0xb0, 0xac, 0xdf, - 0x25, 0x87, 0x2c, 0x1d, 0x85, 0x01, 0x23, 0x02, 0x96, 0x0f, 0x98, 0xac, 0x3e, 0x56, 0xde, 0x99, - 0xf4, 0x2a, 0xc2, 0x6e, 0x43, 0x6f, 0xe2, 0x83, 0xc9, 0xd9, 0xf9, 0xf9, 0xdf, 0xfe, 0xf1, 0xab, - 0x99, 0x6d, 0xb2, 0x85, 0x2d, 0x9a, 0xd1, 0xad, 0xb2, 0xcf, 0x72, 0x6a, 0x9e, 0x70, 0x67, 0xf9, - 0xf7, 0x99, 0x17, 0x2a, 0x17, 0x67, 0xb0, 0x8a, 0x0f, 0xcb, 0x4b, 0xb9, 0xbd, 0x83, 0x6e, 0x77, - 0x88, 0x7b, 0x51, 0xb7, 0xde, 0x33, 0xe5, 0x73, 0xc7, 0x22, 0x23, 0x58, 0x55, 0x2f, 0xc2, 0x8a, - 0x31, 0x41, 0xbe, 0x30, 0xc9, 0x87, 0xe9, 0xb3, 0xf4, 0xec, 0x69, 0x62, 0xe7, 0x26, 0xc2, 0x78, - 0x9f, 0xbc, 0xf7, 0x42, 0x18, 0x38, 0xed, 0x9f, 0x59, 0xb0, 0xd6, 0x9c, 0xf7, 0x4b, 0x3d, 0xf7, - 0x9a, 0xe2, 0xf2, 0x49, 0xee, 0x78, 0xe8, 0xfb, 0x26, 0xf9, 0xd2, 0x4b, 0x7d, 0x9b, 0xb9, 0xff, - 0x10, 0x16, 0x0f, 0x98, 0x34, 0x2f, 0x65, 0x72, 0xdd, 0xcd, 0x9b, 0x57, 0x6e, 0xd1, 0xbc, 0x72, - 0xf7, 0x87, 0x89, 0x1c, 0xf7, 0xca, 0xc7, 0x41, 0xed, 0xa1, 0xee, 0xbc, 0x83, 0x2e, 0xd7, 0xc9, - 0x5a, 0xe1, 0xb2, 0x7c, 0xa5, 0xff, 0xce, 0x52, 0x77, 0xd1, 0x6a, 0xcb, 0x85, 0x6c, 0x54, 0xae, - 0xc0, 0x13, 0x7a, 0x31, 0xbd, 0xfd, 0xcb, 0x1d, 0x25, 0xda, 0x5a, 0x11, 0x0a, 0xbd, 0x2f, 0x5f, - 0x24, 0x14, 0xf4, 0x35, 0xe4, 0xeb, 0xd6, 0x36, 0x22, 0xae, 0x77, 0x76, 0x2a, 0x88, 0x27, 0xb6, - 0x7c, 0x5e, 0x0b, 0xe2, 0x24, 0x47, 0xa2, 0x10, 0xff, 0xd6, 0x82, 0xc5, 0x6a, 0xb3, 0x88, 0xdc, - 0x28, 0x4b, 0xed, 0xf9, 0x1e, 0xd2, 0x55, 0xa1, 0xbd, 0x8d, 0x68, 0xdd, 0xde, 0xcd, 0x8b, 0xa0, - 0xa5, 0x0a, 0x87, 0xc2, 0xfa, 0xe7, 0xbc, 0xfb, 0x58, 0x44, 0x35, 0xf6, 0x0b, 0xcb, 0x3c, 0x6a, - 0xf4, 0x25, 0xaf, 0x0a, 0xaa, 0x8f, 0x50, 0x1f, 0xf4, 0x0e, 0x5e, 0x0c, 0x55, 0x73, 0xcf, 0x3c, - 0xc1, 0xa4, 0x77, 0x6a, 0x1e, 0xbc, 0x67, 0xde, 0x29, 0xde, 0x33, 0xbf, 0xb5, 0xbd, 0x7d, 0xe6, - 0x9d, 0x4a, 0x3a, 0x38, 0x53, 0x13, 0xf9, 0x83, 0x05, 0xdd, 0x4a, 0xd7, 0x92, 0xbc, 0x6b, 0x26, - 0x71, 0xbe, 0x97, 0x79, 0x55, 0xf3, 0xd8, 0xc3, 0x79, 0x7c, 0xa3, 0x77, 0xe7, 0x82, 0xf3, 0xc8, - 0xe2, 0x3e, 0xf7, 0x4e, 0x8b, 0x4b, 0xcb, 0x59, 0x11, 0x2b, 0xd5, 0x7e, 0x60, 0x25, 0x56, 0x26, - 0xb4, 0x09, 0x5f, 0x4b, 0xac, 0xa4, 0x0a, 0x87, 0xc2, 0xfa, 0x08, 0xe6, 0x75, 0xf3, 0x6c, 0x6a, - 0x45, 0x2a, 0x4f, 0x81, 0x4a, 0x53, 0xce, 0x79, 0x1b, 0xdd, 0xad, 0x91, 0x95, 0xc2, 0xdd, 0x28, - 0x17, 0x7e, 0x7b, 0xff, 0x2f, 0xcf, 0x37, 0xac, 0xbf, 0x3e, 0xdf, 0xb0, 0xfe, 0xfe, 0x7c, 0xc3, - 0xfa, 0xd1, 0x87, 0x17, 0xfe, 0x9b, 0xa0, 0xfe, 0xa7, 0xc4, 0xd1, 0x1c, 0xa2, 0xf8, 0xe0, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0x6f, 0x24, 0x83, 0xb4, 0x18, 0x00, 0x00, + 0x15, 0x57, 0x7b, 0x3c, 0xf6, 0xf8, 0x8d, 0xff, 0x96, 0xb3, 0xd9, 0xde, 0xd9, 0x60, 0x99, 0x5e, + 0x24, 0x1c, 0x03, 0xdd, 0x4e, 0x36, 0xca, 0xb2, 0xb0, 0x1c, 0x4c, 0x62, 0x79, 0x83, 0x92, 0xdd, + 0xd0, 0x06, 0x56, 0x20, 0x41, 0x54, 0xee, 0x29, 0xb7, 0x3b, 0xe9, 0xe9, 0x6a, 0xba, 0xaa, 0x27, + 0x8c, 0x2c, 0x1f, 0xe0, 0x0b, 0x70, 0xe0, 0x2b, 0x20, 0x21, 0x4e, 0x08, 0x89, 0x0b, 0x07, 0xae, + 0x88, 0x23, 0x12, 0x47, 0x2e, 0x28, 0xe2, 0xc2, 0x91, 0x0b, 0x67, 0x54, 0xaf, 0xab, 0xab, 0xff, + 0x78, 0x9c, 0x38, 0xb2, 0x21, 0x7b, 0x9a, 0x7a, 0xef, 0xd5, 0x7b, 0xef, 0x57, 0x5d, 0xef, 0xbd, + 0xaa, 0x7a, 0x03, 0xef, 0xa5, 0xcf, 0x42, 0x8f, 0xa6, 0x51, 0x10, 0x47, 0x2c, 0x91, 0x5e, 0xc6, + 0xe3, 0x98, 0xe7, 0xe6, 0xd7, 0x4d, 0x33, 0x2e, 0x39, 0x99, 0xd7, 0xe4, 0xe0, 0x46, 0xc8, 0x79, + 0x18, 0x33, 0xa5, 0xe0, 0xd1, 0x24, 0xe1, 0x92, 0xca, 0x88, 0x27, 0xa2, 0x98, 0x36, 0x78, 0x18, + 0x46, 0xf2, 0x38, 0x3f, 0x74, 0x03, 0x3e, 0xf2, 0x68, 0x16, 0xf2, 0x34, 0xe3, 0x4f, 0x71, 0xf0, + 0x35, 0xad, 0x2f, 0x3c, 0xed, 0x4d, 0x78, 0x86, 0x33, 0xbe, 0x45, 0xe3, 0xf4, 0x98, 0xde, 0xf2, + 0x42, 0x96, 0xb0, 0x8c, 0x4a, 0x36, 0xd4, 0xd6, 0xee, 0x3c, 0xfb, 0xba, 0x70, 0x23, 0xae, 0xa6, + 0x8f, 0x68, 0x70, 0x1c, 0x25, 0x2c, 0x9b, 0x54, 0xfa, 0x23, 0x26, 0xa9, 0x37, 0x3e, 0xab, 0xf5, + 0xae, 0x46, 0x88, 0xd4, 0x61, 0x7e, 0xe4, 0xb1, 0x51, 0x2a, 0x27, 0x85, 0xd0, 0xb9, 0x0f, 0xab, + 0x7e, 0xe1, 0xf7, 0x41, 0x72, 0xc4, 0xbf, 0x9b, 0xb3, 0x6c, 0x42, 0x08, 0xcc, 0x26, 0x74, 0xc4, + 0x6c, 0x6b, 0xd3, 0xda, 0x5a, 0xf0, 0x71, 0x4c, 0x6e, 0xc0, 0x82, 0xfa, 0x15, 0x29, 0x0d, 0x98, + 0x3d, 0x83, 0x82, 0x8a, 0xe1, 0xdc, 0x81, 0x6b, 0x35, 0x2b, 0x0f, 0x23, 0x21, 0x0b, 0x4b, 0x0d, + 0x2d, 0xab, 0xad, 0xf5, 0x4b, 0x0b, 0x56, 0x0e, 0x98, 0x7c, 0x30, 0xa2, 0x21, 0xf3, 0xd9, 0x4f, + 0x73, 0x26, 0x24, 0xb1, 0xa1, 0xfc, 0xb2, 0x7a, 0x7e, 0x49, 0x2a, 0x5b, 0x01, 0x4f, 0x24, 0x55, + 0xab, 0x2e, 0x11, 0x18, 0x06, 0xb9, 0x06, 0xdd, 0x48, 0xd9, 0xb1, 0x3b, 0x28, 0x29, 0x08, 0xb2, + 0x0a, 0x1d, 0x49, 0x43, 0x7b, 0x16, 0x79, 0x6a, 0xd8, 0x44, 0xd4, 0x6d, 0x23, 0x3a, 0x06, 0xf2, + 0xfd, 0x64, 0xc8, 0xf5, 0x5a, 0x5e, 0x8d, 0x69, 0x00, 0xbd, 0x8c, 0x8d, 0x23, 0x11, 0xf1, 0x04, + 0x21, 0x75, 0x7c, 0x43, 0x37, 0x3d, 0x75, 0xda, 0x9e, 0x1e, 0xc0, 0x5b, 0x3e, 0x13, 0x92, 0x66, + 0xb2, 0xe5, 0xec, 0xf5, 0x3f, 0xfe, 0x8f, 0xe1, 0xad, 0xc7, 0x19, 0x1f, 0x71, 0xc9, 0x2e, 0x6b, + 0x4a, 0x69, 0x1c, 0xe5, 0x71, 0x8c, 0x70, 0x7b, 0x3e, 0x8e, 0x9d, 0x7d, 0x58, 0xdf, 0x3d, 0xe4, + 0x57, 0x80, 0x73, 0x1f, 0xd6, 0x7d, 0x26, 0xb3, 0xc9, 0xa5, 0x0d, 0x3d, 0x81, 0x35, 0x6d, 0xe3, + 0x33, 0x2a, 0x83, 0xe3, 0xbd, 0x31, 0x4b, 0xd0, 0x8c, 0x9c, 0xa4, 0xc6, 0x8c, 0x1a, 0x93, 0xbb, + 0xd0, 0xcf, 0xaa, 0xb0, 0x44, 0x43, 0xfd, 0xdb, 0xd7, 0xdc, 0x32, 0x93, 0x6b, 0x21, 0xeb, 0xd7, + 0x27, 0x3a, 0x4f, 0x60, 0xe9, 0x93, 0xd2, 0x9b, 0x62, 0xbc, 0x3c, 0x8e, 0xc9, 0x0e, 0xac, 0xd3, + 0x31, 0x8d, 0x62, 0x7a, 0x18, 0x33, 0xa3, 0x27, 0xec, 0x99, 0xcd, 0xce, 0xd6, 0x82, 0x3f, 0x4d, + 0xe4, 0xdc, 0x83, 0x95, 0x56, 0xbe, 0x90, 0x1d, 0xe8, 0x95, 0x05, 0xc0, 0xb6, 0x36, 0x3b, 0xe7, + 0x02, 0x35, 0xb3, 0x9c, 0x0f, 0xa0, 0xff, 0x03, 0x96, 0xa9, 0x58, 0x43, 0x8c, 0x5b, 0xb0, 0x52, + 0x8a, 0x34, 0x5b, 0x23, 0x6d, 0xb3, 0x9d, 0xdf, 0xcc, 0x41, 0xbf, 0x66, 0x92, 0x3c, 0x06, 0xe0, + 0x87, 0x4f, 0x59, 0x20, 0x1f, 0x31, 0x49, 0x51, 0xa9, 0x7f, 0x7b, 0xc7, 0x2d, 0x6a, 0x8d, 0x5b, + 0xaf, 0x35, 0x6e, 0xfa, 0x2c, 0x54, 0x0c, 0xe1, 0xaa, 0x5a, 0xe3, 0x8e, 0x6f, 0xb9, 0x9f, 0x1a, + 0x3d, 0xbf, 0x66, 0x83, 0x5c, 0x87, 0x39, 0x21, 0xa9, 0xcc, 0x85, 0xde, 0x3c, 0x4d, 0xa9, 0x4c, + 0x1a, 0x31, 0x21, 0xaa, 0x3c, 0x2d, 0x49, 0xb5, 0x7d, 0x51, 0xc0, 0x13, 0x9d, 0xaa, 0x38, 0x56, + 0xd9, 0x25, 0xa4, 0xaa, 0x64, 0xe1, 0x44, 0xa7, 0xaa, 0xa1, 0xd5, 0x7c, 0x21, 0x59, 0x6a, 0xcf, + 0x15, 0xf3, 0xd5, 0x58, 0xed, 0x92, 0x60, 0xf2, 0x33, 0x16, 0x85, 0xc7, 0xd2, 0x9e, 0x2f, 0x76, + 0xc9, 0x30, 0x88, 0x03, 0x8b, 0x34, 0x90, 0x39, 0x8d, 0xf5, 0x84, 0x1e, 0x4e, 0x68, 0xf0, 0x54, + 0x15, 0xc9, 0x18, 0x1d, 0x4e, 0xec, 0x85, 0x4d, 0x6b, 0xab, 0xeb, 0x17, 0x84, 0x42, 0x1d, 0xe4, + 0x59, 0xc6, 0x12, 0x69, 0x03, 0xf2, 0x4b, 0x52, 0x49, 0x86, 0x4c, 0x44, 0x19, 0x1b, 0xda, 0xfd, + 0x42, 0xa2, 0x49, 0x25, 0xc9, 0xd3, 0xa1, 0xaa, 0xc2, 0xf6, 0x62, 0x21, 0xd1, 0xa4, 0x42, 0x69, + 0x42, 0xc2, 0x5e, 0x42, 0x59, 0xc5, 0x20, 0x9b, 0xd0, 0xcf, 0x8a, 0xba, 0xc0, 0x86, 0xbb, 0xd2, + 0x5e, 0x46, 0x90, 0x75, 0x16, 0xd9, 0x00, 0xd0, 0x15, 0x5e, 0x6d, 0xf1, 0x0a, 0x4e, 0xa8, 0x71, + 0xc8, 0x87, 0xca, 0x42, 0x1a, 0x47, 0x01, 0x3d, 0x60, 0x52, 0xd8, 0xab, 0x18, 0x4b, 0x6f, 0x57, + 0xb1, 0x64, 0x64, 0x3a, 0xee, 0xab, 0xb9, 0x4a, 0x95, 0xfd, 0x2c, 0x65, 0x59, 0x34, 0x62, 0x89, + 0x14, 0xf6, 0x5a, 0x4b, 0x75, 0xcf, 0xc8, 0x0a, 0xd5, 0xda, 0x5c, 0xf2, 0x11, 0x2c, 0xd2, 0x84, + 0xc6, 0x13, 0x11, 0x09, 0x3f, 0x4f, 0x84, 0x4d, 0x50, 0xd7, 0x36, 0xba, 0xbb, 0x95, 0x10, 0x95, + 0x1b, 0xb3, 0xc9, 0x5d, 0x00, 0x53, 0xca, 0x85, 0xbd, 0x8e, 0xba, 0xd7, 0x8d, 0xee, 0xbd, 0x52, + 0x84, 0x9a, 0xb5, 0x99, 0xe4, 0x27, 0xd0, 0x55, 0x3b, 0x2f, 0xec, 0x6b, 0xa8, 0xf2, 0xb1, 0x5b, + 0x1d, 0xb7, 0x6e, 0x79, 0xdc, 0xe2, 0xe0, 0x49, 0x99, 0x03, 0x55, 0x08, 0x1b, 0x4e, 0x79, 0xdc, + 0xba, 0xf7, 0x68, 0x42, 0xb3, 0xc9, 0x81, 0x64, 0xa9, 0x5f, 0x98, 0x75, 0xfe, 0x34, 0x03, 0xcb, + 0xcd, 0x55, 0xff, 0x0f, 0x92, 0xa5, 0x0c, 0xfd, 0x99, 0x66, 0xe8, 0x9b, 0x83, 0xa5, 0xd3, 0x3a, + 0x58, 0xaa, 0xe4, 0x9a, 0x3d, 0x2f, 0xb9, 0xba, 0xcd, 0xe4, 0x6a, 0x85, 0xc4, 0xdc, 0x6b, 0x84, + 0x44, 0x7b, 0x5f, 0xe7, 0x5f, 0x67, 0x5f, 0x9d, 0xff, 0x74, 0x60, 0xb9, 0x69, 0xfd, 0xff, 0x58, + 0x6c, 0xca, 0xef, 0xda, 0x39, 0xe7, 0xbb, 0xce, 0x4e, 0xfd, 0xae, 0x2a, 0x2b, 0xbb, 0x78, 0xfc, + 0x69, 0x4a, 0xf1, 0x03, 0x8c, 0x0c, 0x2c, 0x36, 0x3d, 0x5f, 0x53, 0x8a, 0x4f, 0x03, 0x19, 0x8d, + 0x19, 0xd6, 0x9a, 0x9e, 0xaf, 0x29, 0xb5, 0x0f, 0xa9, 0x32, 0xca, 0x9e, 0x63, 0x8d, 0xe9, 0xf9, + 0x25, 0x59, 0x78, 0xc7, 0xaf, 0x21, 0x74, 0x85, 0x31, 0x74, 0xb3, 0x2c, 0x40, 0xbb, 0x2c, 0x0c, + 0xa0, 0x27, 0xd9, 0x28, 0x8d, 0xa9, 0x64, 0x58, 0x69, 0x16, 0x7c, 0x43, 0x93, 0xaf, 0xc2, 0x9a, + 0x08, 0x68, 0xcc, 0xee, 0xf3, 0xe7, 0xc9, 0x7d, 0x46, 0x87, 0x71, 0x94, 0x30, 0x2c, 0x3a, 0x0b, + 0xfe, 0x59, 0x81, 0x42, 0x8d, 0x77, 0x23, 0x61, 0x2f, 0xe1, 0xf9, 0xa4, 0x29, 0xf2, 0x25, 0x98, + 0x4d, 0xf9, 0x50, 0xd8, 0xcb, 0xb8, 0xc1, 0xab, 0x66, 0x83, 0x1f, 0xf3, 0x21, 0x6e, 0x2c, 0x4a, + 0xd5, 0x37, 0x4d, 0xa3, 0x24, 0xc4, 0xb2, 0xd3, 0xf3, 0x71, 0x8c, 0x3c, 0x9e, 0x84, 0xf6, 0xaa, + 0xe6, 0xf1, 0x24, 0x74, 0xfe, 0x68, 0xc1, 0xbc, 0xd6, 0x7c, 0xc3, 0x3b, 0x6e, 0x4a, 0x7a, 0x91, + 0x2c, 0xba, 0xa4, 0xe3, 0x4e, 0x60, 0x4d, 0x15, 0xb8, 0xdb, 0xb8, 0x13, 0x05, 0xed, 0x7c, 0x08, + 0x4b, 0x8d, 0x8a, 0x33, 0xf5, 0x86, 0x62, 0xee, 0x9b, 0x33, 0xb5, 0xfb, 0xa6, 0xf3, 0x6f, 0x0b, + 0xe6, 0xbf, 0xc3, 0x0f, 0x3f, 0x07, 0xcb, 0xde, 0x00, 0x18, 0x31, 0x99, 0x45, 0x81, 0xba, 0x75, + 0xe8, 0xb5, 0xd7, 0x38, 0xe4, 0x63, 0x58, 0xa8, 0x4e, 0x99, 0x2e, 0x82, 0xdb, 0xbe, 0x18, 0xb8, + 0xef, 0x45, 0x23, 0xe6, 0x57, 0xca, 0xce, 0xdf, 0x2d, 0x58, 0x3a, 0x48, 0x59, 0xb0, 0x9b, 0x0c, + 0x0f, 0x0a, 0x3c, 0x14, 0x66, 0x45, 0xca, 0x02, 0xbd, 0xe6, 0x47, 0x97, 0x2b, 0xca, 0xb5, 0x02, + 0xa3, 0xbc, 0xf8, 0x68, 0x9a, 0x84, 0x8d, 0x4f, 0xd1, 0xbf, 0xfd, 0xe9, 0xd5, 0x39, 0x41, 0xb3, + 0xe5, 0xb7, 0x75, 0x5e, 0x74, 0x60, 0xa5, 0x55, 0xe3, 0x3e, 0xc7, 0x47, 0xc0, 0x06, 0x80, 0xc8, + 0x83, 0x80, 0x09, 0x71, 0x94, 0xc7, 0x3a, 0xb0, 0x6b, 0x1c, 0xa5, 0x77, 0x44, 0xa3, 0x98, 0x0d, + 0xb1, 0x94, 0x75, 0x7d, 0x4d, 0xa9, 0xbb, 0x51, 0x94, 0x04, 0x3c, 0x09, 0xe2, 0x5c, 0x94, 0x05, + 0xad, 0xeb, 0x37, 0x78, 0x2a, 0xe2, 0x59, 0x96, 0xf1, 0x0c, 0x8b, 0x5a, 0xd7, 0x2f, 0x08, 0x55, + 0x36, 0x9e, 0xf2, 0x43, 0x55, 0xce, 0x9a, 0x65, 0x43, 0x67, 0x81, 0x8f, 0x52, 0xf2, 0x3e, 0x40, + 0xc2, 0x13, 0xcd, 0xb3, 0x01, 0xe7, 0xae, 0x9b, 0xb9, 0x9f, 0x18, 0x91, 0x5f, 0x9b, 0x46, 0xb6, + 0xd5, 0x79, 0xa6, 0x02, 0x56, 0xd8, 0xfd, 0x96, 0xf5, 0x47, 0x05, 0xdf, 0x2f, 0x27, 0x90, 0x8f, + 0x60, 0x49, 0xd4, 0x63, 0x10, 0xeb, 0x5f, 0xfd, 0x0e, 0xd1, 0x88, 0x50, 0xbf, 0x39, 0xd9, 0xf9, + 0xb5, 0x05, 0x50, 0x81, 0x50, 0x2b, 0x1d, 0xd3, 0x38, 0x2f, 0x13, 0xbe, 0x20, 0xce, 0xcd, 0xbe, + 0x66, 0xa6, 0x75, 0x5e, 0x9e, 0x69, 0xb3, 0x97, 0xc9, 0xb4, 0xdf, 0x5b, 0x30, 0xaf, 0x57, 0x3e, + 0xb5, 0x26, 0x6d, 0xc3, 0xaa, 0xde, 0xeb, 0x7b, 0x3c, 0x19, 0x46, 0x32, 0x32, 0x11, 0x75, 0x86, + 0xaf, 0xd6, 0x18, 0xf0, 0x3c, 0x91, 0x08, 0xb8, 0xeb, 0x17, 0x84, 0x3a, 0x4a, 0xea, 0x7b, 0xfe, + 0x30, 0x1a, 0x45, 0x05, 0xe6, 0xae, 0x7f, 0x56, 0xa0, 0xa2, 0x46, 0xc5, 0x4f, 0x9e, 0xe9, 0x89, + 0x45, 0xbc, 0x35, 0x78, 0xb7, 0xff, 0xb5, 0x04, 0xcb, 0xfa, 0xad, 0x71, 0xc0, 0xb2, 0x71, 0x14, + 0x30, 0x22, 0x60, 0x79, 0x9f, 0xc9, 0xfa, 0x03, 0xe4, 0x9d, 0x69, 0x2f, 0x1d, 0xec, 0x20, 0x0c, + 0xa6, 0x3e, 0x82, 0x9c, 0x9d, 0x5f, 0xfc, 0xed, 0x9f, 0xbf, 0x9a, 0xd9, 0x26, 0x5b, 0xd8, 0x76, + 0x19, 0xdf, 0xaa, 0x7a, 0x27, 0x27, 0xe6, 0x59, 0x76, 0x5a, 0x8c, 0x4f, 0xbd, 0x48, 0xb9, 0x38, + 0x85, 0x55, 0x7c, 0x2c, 0x5e, 0xca, 0xed, 0x5d, 0x74, 0xbb, 0x43, 0xdc, 0x8b, 0xba, 0xf5, 0x9e, + 0x2b, 0x9f, 0x3b, 0x16, 0x19, 0xc3, 0xaa, 0x7a, 0xe5, 0xd5, 0x8c, 0x09, 0xf2, 0x85, 0x69, 0x3e, + 0x4c, 0xef, 0x64, 0x60, 0x9f, 0x27, 0x76, 0x6e, 0x22, 0x8c, 0xf7, 0xc8, 0x17, 0x5f, 0x0a, 0x03, + 0x97, 0xfd, 0x73, 0x0b, 0xd6, 0xda, 0xeb, 0x7e, 0xa5, 0xe7, 0x41, 0x5b, 0x5c, 0x3d, 0xb3, 0x1d, + 0x0f, 0x7d, 0xdf, 0x24, 0x5f, 0x7e, 0xa5, 0x6f, 0xb3, 0xf6, 0x1f, 0xc2, 0xe2, 0x3e, 0x93, 0xe6, + 0xf5, 0x4b, 0xae, 0xbb, 0x45, 0x43, 0xca, 0x2d, 0x1b, 0x52, 0xee, 0xde, 0x28, 0x95, 0x93, 0x41, + 0x95, 0xac, 0x8d, 0xc7, 0xb7, 0xf3, 0x0e, 0xba, 0x5c, 0x27, 0x6b, 0xa5, 0xcb, 0xea, 0xe5, 0xfd, + 0x3b, 0x4b, 0xdd, 0x2f, 0xeb, 0x6d, 0x14, 0xb2, 0x51, 0xbb, 0xd6, 0x4e, 0xe9, 0xaf, 0x0c, 0xf6, + 0x2e, 0x77, 0x52, 0x68, 0x6b, 0x65, 0x28, 0x0c, 0xbe, 0x72, 0x91, 0x50, 0xd0, 0x57, 0x8b, 0x6f, + 0x58, 0xdb, 0x88, 0xb8, 0xd9, 0xad, 0xa9, 0x21, 0x9e, 0xda, 0xc6, 0x79, 0x23, 0x88, 0xd3, 0x02, + 0x89, 0x42, 0xfc, 0x5b, 0x0b, 0x16, 0xeb, 0x0d, 0x20, 0x72, 0xa3, 0xba, 0xfc, 0x9f, 0xed, 0x0b, + 0x5d, 0x15, 0xda, 0x3b, 0x88, 0xd6, 0x1d, 0xdc, 0xbc, 0x08, 0x5a, 0xaa, 0x70, 0x28, 0xac, 0x7f, + 0x2e, 0x3a, 0x8a, 0x65, 0x54, 0x63, 0x0f, 0xb0, 0xca, 0xa3, 0x56, 0xaf, 0xf1, 0xaa, 0xa0, 0xfa, + 0x08, 0xf5, 0xe1, 0x60, 0xff, 0xe5, 0x50, 0x35, 0xf7, 0xd4, 0x13, 0x4c, 0x7a, 0x27, 0xe6, 0x11, + 0x7b, 0xea, 0x9d, 0xe0, 0xdd, 0xf1, 0x5b, 0xdb, 0xdb, 0xa7, 0xde, 0x89, 0xa4, 0xe1, 0xa9, 0x5a, + 0xc8, 0x1f, 0x2c, 0xe8, 0xd7, 0x3a, 0x91, 0xe4, 0x5d, 0xb3, 0x88, 0xb3, 0xfd, 0xc9, 0xab, 0x5a, + 0xc7, 0x2e, 0xae, 0xe3, 0x9b, 0x83, 0xbb, 0x17, 0x5c, 0x47, 0x9e, 0x0c, 0xb9, 0x77, 0x52, 0xde, + 0x49, 0x4e, 0xcb, 0x58, 0xa9, 0xf7, 0xf8, 0x6a, 0xb1, 0x32, 0xa5, 0xf5, 0xf7, 0x46, 0x62, 0x25, + 0x53, 0x38, 0x14, 0xd6, 0xc7, 0x30, 0xaf, 0x1b, 0x62, 0xe7, 0x56, 0xa4, 0xea, 0x14, 0xa8, 0x35, + 0xda, 0x9c, 0xb7, 0xd1, 0xdd, 0x1a, 0x59, 0x29, 0xdd, 0x8d, 0x0b, 0xe1, 0xb7, 0xf7, 0xfe, 0xf2, + 0x62, 0xc3, 0xfa, 0xeb, 0x8b, 0x0d, 0xeb, 0x1f, 0x2f, 0x36, 0xac, 0x1f, 0x7d, 0x70, 0xe1, 0xd6, + 0x7f, 0xf3, 0x8f, 0x86, 0xc3, 0x39, 0x44, 0xf1, 0xfe, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x20, + 0xf9, 0xb1, 0x05, 0x88, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3564,7 +3567,7 @@ func (m *JobInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *AnalysisRunSpecAndStatus) Marshal() (dAtA []byte, err error) { +func (m *SpecAndStatus) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3574,12 +3577,12 @@ func (m *AnalysisRunSpecAndStatus) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *AnalysisRunSpecAndStatus) MarshalTo(dAtA []byte) (int, error) { +func (m *SpecAndStatus) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *AnalysisRunSpecAndStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpecAndStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3639,9 +3642,9 @@ func (m *AnalysisRunInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.AnalysisRunSpecAndStatus != nil { + if m.SpecAndStatus != nil { { - size, err := m.AnalysisRunSpecAndStatus.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.SpecAndStatus.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4418,7 +4421,7 @@ func (m *JobInfo) Size() (n int) { return n } -func (m *AnalysisRunSpecAndStatus) Size() (n int) { +func (m *SpecAndStatus) Size() (n int) { if m == nil { return 0 } @@ -4489,8 +4492,8 @@ func (m *AnalysisRunInfo) Size() (n int) { n += 1 + l + sovRollout(uint64(l)) } } - if m.AnalysisRunSpecAndStatus != nil { - l = m.AnalysisRunSpecAndStatus.Size() + if m.SpecAndStatus != nil { + l = m.SpecAndStatus.Size() n += 1 + l + sovRollout(uint64(l)) } if m.XXX_unrecognized != nil { @@ -7891,7 +7894,7 @@ func (m *JobInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *AnalysisRunSpecAndStatus) Unmarshal(dAtA []byte) error { +func (m *SpecAndStatus) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7914,10 +7917,10 @@ func (m *AnalysisRunSpecAndStatus) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: AnalysisRunSpecAndStatus: wiretype end group for non-group") + return fmt.Errorf("proto: SpecAndStatus: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: AnalysisRunSpecAndStatus: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpecAndStatus: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8342,7 +8345,7 @@ func (m *AnalysisRunInfo) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 12: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AnalysisRunSpecAndStatus", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SpecAndStatus", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8369,10 +8372,10 @@ func (m *AnalysisRunInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.AnalysisRunSpecAndStatus == nil { - m.AnalysisRunSpecAndStatus = &AnalysisRunSpecAndStatus{} + if m.SpecAndStatus == nil { + m.SpecAndStatus = &SpecAndStatus{} } - if err := m.AnalysisRunSpecAndStatus.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.SpecAndStatus.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/pkg/apiclient/rollout/rollout.proto b/pkg/apiclient/rollout/rollout.proto index deea245d9c..0346a8cd59 100644 --- a/pkg/apiclient/rollout/rollout.proto +++ b/pkg/apiclient/rollout/rollout.proto @@ -148,13 +148,16 @@ message JobInfo { k8s.io.apimachinery.pkg.apis.meta.v1.Time startedAt = 5; } -message AnalysisRunSpecAndStatus { +message SpecAndStatus { github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.AnalysisRunSpec spec = 1; github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.AnalysisRunStatus status = 2; } message AnalysisRunInfo { k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta objectMeta = 1; + /* + type from 161 -178 will be deprecated in future. + */ string icon = 2; int64 revision = 3; string status = 4; @@ -165,7 +168,8 @@ message AnalysisRunInfo { repeated JobInfo jobs = 9; repeated NonJobInfo nonJobInfo = 10; repeated Metrics metrics = 11; - AnalysisRunSpecAndStatus analysisRunSpecAndStatus = 12; + /* The new API changes should use SpecAndStatus. */ + SpecAndStatus specAndStatus = 12; } message NonJobInfo { diff --git a/pkg/apiclient/rollout/rollout.swagger.json b/pkg/apiclient/rollout/rollout.swagger.json index 2bfa41ae4f..c44b79a8d3 100755 --- a/pkg/apiclient/rollout/rollout.swagger.json +++ b/pkg/apiclient/rollout/rollout.swagger.json @@ -5530,7 +5530,8 @@ "$ref": "#/definitions/k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta" }, "icon": { - "type": "string" + "type": "string", + "description": "type from 161 -178 will be deprecated in future." }, "revision": { "type": "string", @@ -5573,19 +5574,9 @@ "$ref": "#/definitions/rollout.Metrics" } }, - "analysisRunSpecAndStatus": { - "$ref": "#/definitions/rollout.AnalysisRunSpecAndStatus" - } - } - }, - "rollout.AnalysisRunSpecAndStatus": { - "type": "object", - "properties": { - "spec": { - "$ref": "#/definitions/github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.AnalysisRunSpec" - }, - "status": { - "$ref": "#/definitions/github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.AnalysisRunStatus" + "specAndStatus": { + "$ref": "#/definitions/rollout.SpecAndStatus", + "description": "The new API changes should use SpecAndStatus." } } }, @@ -5953,6 +5944,17 @@ } } }, + "rollout.SpecAndStatus": { + "type": "object", + "properties": { + "spec": { + "$ref": "#/definitions/github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.AnalysisRunSpec" + }, + "status": { + "$ref": "#/definitions/github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.AnalysisRunStatus" + } + } + }, "rollout.UndoRolloutRequest": { "type": "object", "properties": { diff --git a/pkg/kubectl-argo-rollouts/info/analysisrun_info.go b/pkg/kubectl-argo-rollouts/info/analysisrun_info.go index 2579084b5b..abba317296 100644 --- a/pkg/kubectl-argo-rollouts/info/analysisrun_info.go +++ b/pkg/kubectl-argo-rollouts/info/analysisrun_info.go @@ -27,7 +27,7 @@ func getAnalysisRunInfo(ownerUID types.UID, allAnalysisRuns []*v1alpha1.Analysis }, } - arInfo.AnalysisRunSpecAndStatus = &rollout.AnalysisRunSpecAndStatus{ + arInfo.SpecAndStatus = &rollout.SpecAndStatus{ Spec: &run.Spec, Status: &run.Status, } diff --git a/ui/src/models/rollout/generated/api.ts b/ui/src/models/rollout/generated/api.ts index 82aa155e3f..25fb924c5d 100755 --- a/ui/src/models/rollout/generated/api.ts +++ b/ui/src/models/rollout/generated/api.ts @@ -6685,7 +6685,7 @@ export interface RolloutAnalysisRunInfo { */ objectMeta?: K8sIoApimachineryPkgApisMetaV1ObjectMeta; /** - * + * type from 161 -178 will be deprecated in future. * @type {string} * @memberof RolloutAnalysisRunInfo */ @@ -6746,29 +6746,10 @@ export interface RolloutAnalysisRunInfo { metrics?: Array; /** * - * @type {RolloutAnalysisRunSpecAndStatus} + * @type {RolloutSpecAndStatus} * @memberof RolloutAnalysisRunInfo */ - analysisRunSpecAndStatus?: RolloutAnalysisRunSpecAndStatus; -} -/** - * - * @export - * @interface RolloutAnalysisRunSpecAndStatus - */ -export interface RolloutAnalysisRunSpecAndStatus { - /** - * - * @type {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunSpec} - * @memberof RolloutAnalysisRunSpecAndStatus - */ - spec?: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunSpec; - /** - * - * @type {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunStatus} - * @memberof RolloutAnalysisRunSpecAndStatus - */ - status?: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunStatus; + specAndStatus?: RolloutSpecAndStatus; } /** * @@ -7361,6 +7342,25 @@ export interface RolloutSetImageRequest { */ namespace?: string; } +/** + * + * @export + * @interface RolloutSpecAndStatus + */ +export interface RolloutSpecAndStatus { + /** + * + * @type {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunSpec} + * @memberof RolloutSpecAndStatus + */ + spec?: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunSpec; + /** + * + * @type {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunStatus} + * @memberof RolloutSpecAndStatus + */ + status?: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1AnalysisRunStatus; +} /** * * @export