diff --git a/iri/apis/machine/v1alpha1/api.pb.go b/iri/apis/machine/v1alpha1/api.pb.go index 930994a21..7161c8bd8 100644 --- a/iri/apis/machine/v1alpha1/api.pb.go +++ b/iri/apis/machine/v1alpha1/api.pb.go @@ -979,7 +979,6 @@ type NetworkInterfaceStatus struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Handle string `protobuf:"bytes,2,opt,name=handle,proto3" json:"handle,omitempty"` State NetworkInterfaceState `protobuf:"varint,3,opt,name=state,proto3,enum=machine.v1alpha1.NetworkInterfaceState" json:"state,omitempty"` - Ips []string `protobuf:"bytes,4,rep,name=ips,proto3" json:"ips,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_sizecache int32 `json:"-"` } @@ -1037,13 +1036,6 @@ func (m *NetworkInterfaceStatus) GetState() NetworkInterfaceState { return NetworkInterfaceState_NETWORK_INTERFACE_PENDING } -func (m *NetworkInterfaceStatus) GetIps() []string { - if m != nil { - return m.Ips - } - return nil -} - type MachineClass struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Capabilities *MachineClassCapabilities `protobuf:"bytes,2,opt,name=capabilities,proto3" json:"capabilities,omitempty"` @@ -2376,132 +2368,131 @@ func init() { func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) } var fileDescriptor_00212fb1f9d3bf1c = []byte{ - // 1989 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4b, 0x73, 0x1b, 0x59, - 0x15, 0x76, 0x4b, 0xb2, 0x6c, 0x1d, 0xc9, 0xb2, 0x72, 0xfd, 0x88, 0xd2, 0x83, 0x14, 0xa5, 0x27, - 0x4c, 0x5c, 0x26, 0x91, 0x62, 0x85, 0xcc, 0x0c, 0xa9, 0x1a, 0x0a, 0x59, 0x96, 0x27, 0x26, 0xb6, - 0x1c, 0xda, 0x8e, 0xc3, 0x50, 0x50, 0x5d, 0xad, 0xd6, 0xb5, 0xdd, 0x44, 0xea, 0xd6, 0x74, 0xb7, - 0x34, 0x98, 0xd9, 0x0c, 0x3b, 0x36, 0x14, 0x6c, 0xf8, 0x0b, 0x6c, 0xd8, 0x40, 0x15, 0x4b, 0x7e, - 0xc0, 0x2c, 0xd9, 0xc1, 0x92, 0x09, 0x55, 0x2c, 0xf8, 0x15, 0xd4, 0x7d, 0x74, 0xab, 0x25, 0xdd, - 0xd6, 0x63, 0xa0, 0x6a, 0x76, 0xba, 0xa7, 0xbf, 0xf3, 0x9d, 0x47, 0x9f, 0x7b, 0xce, 0xe9, 0x12, - 0xa4, 0xf4, 0x9e, 0x59, 0xee, 0x39, 0xb6, 0x67, 0xa3, 0x5c, 0x57, 0x37, 0xae, 0x4d, 0x0b, 0x97, - 0x07, 0x7b, 0x7a, 0xa7, 0x77, 0xad, 0xef, 0xc9, 0x8f, 0xae, 0x4c, 0xef, 0xba, 0xdf, 0x2a, 0x1b, - 0x76, 0xb7, 0x72, 0x65, 0x5f, 0xd9, 0x15, 0x0a, 0x6c, 0xf5, 0x2f, 0xe9, 0x89, 0x1e, 0xe8, 0x2f, - 0x46, 0x20, 0xd7, 0x42, 0x70, 0xd3, 0xb1, 0x2d, 0xc3, 0x76, 0xf0, 0xa3, 0x36, 0x1e, 0x04, 0x87, - 0x8a, 0xe9, 0x98, 0x15, 0xbd, 0x67, 0xba, 0x95, 0x2e, 0xf6, 0xf4, 0x8a, 0x6f, 0xa7, 0x12, 0xf8, - 0x20, 0xef, 0xcf, 0x4f, 0x81, 0x07, 0xd8, 0xf2, 0x04, 0x1c, 0xca, 0xdf, 0x63, 0x00, 0x17, 0x76, - 0xa7, 0xdf, 0xc5, 0x67, 0x3d, 0x6c, 0xa0, 0x6d, 0x48, 0xb6, 0x1d, 0x73, 0x80, 0x9d, 0xbc, 0x54, - 0x92, 0x76, 0x52, 0x2a, 0x3f, 0x11, 0xf9, 0xb5, 0x6e, 0xb5, 0x3b, 0x38, 0x1f, 0x63, 0x72, 0x76, - 0x42, 0xc7, 0x00, 0xba, 0xe7, 0x39, 0x66, 0xab, 0xef, 0x61, 0x37, 0x1f, 0x2f, 0xc5, 0x77, 0xd2, - 0xd5, 0x87, 0xe5, 0xf1, 0xdc, 0x94, 0x87, 0x16, 0xca, 0xb5, 0x00, 0xde, 0xb0, 0x3c, 0xe7, 0x46, - 0x0d, 0xe9, 0xa3, 0x13, 0x48, 0xbb, 0xd8, 0x70, 0xb0, 0xa7, 0xb5, 0x75, 0x4f, 0xcf, 0x27, 0xe6, - 0xa0, 0x3b, 0xa3, 0xf8, 0x03, 0xdd, 0xd3, 0x39, 0x9d, 0x1b, 0x08, 0xe4, 0x8f, 0x60, 0x7d, 0xcc, - 0x1a, 0xca, 0x41, 0xfc, 0x0d, 0xbe, 0xe1, 0xc1, 0x91, 0x9f, 0x68, 0x13, 0x96, 0x07, 0x7a, 0xa7, - 0xef, 0x07, 0xc6, 0x0e, 0xcf, 0x62, 0x1f, 0x4a, 0x44, 0x7d, 0x8c, 0x7d, 0x96, 0x7a, 0x26, 0xa4, - 0xae, 0xfc, 0x55, 0x82, 0xb5, 0x13, 0xe6, 0xf9, 0xa1, 0xd9, 0xf1, 0xb0, 0x83, 0xb2, 0x10, 0x33, - 0xdb, 0x5c, 0x39, 0x66, 0xb6, 0xd1, 0x27, 0x90, 0xed, 0xe8, 0x2d, 0xdc, 0xd1, 0x5c, 0xdc, 0xc1, - 0x86, 0x67, 0x3b, 0xf9, 0x18, 0x8d, 0xb8, 0x3a, 0x19, 0xf1, 0x08, 0x51, 0xf9, 0x98, 0x68, 0x9d, - 0x71, 0x25, 0x16, 0xf7, 0x5a, 0x27, 0x2c, 0x93, 0x7f, 0x00, 0x68, 0x12, 0xb4, 0x48, 0xf4, 0xca, - 0xaf, 0x63, 0x90, 0x6e, 0x90, 0xaa, 0x89, 0x70, 0xfe, 0x75, 0x84, 0xf3, 0x8f, 0x27, 0x9d, 0x0f, - 0xd1, 0xcc, 0x76, 0x1d, 0xed, 0x40, 0x8e, 0x56, 0xab, 0xab, 0x5d, 0x3a, 0x76, 0x57, 0xf3, 0xcc, - 0x2e, 0xce, 0xc7, 0x4b, 0xd2, 0x4e, 0x5c, 0xcd, 0x32, 0xf9, 0xa1, 0x63, 0x77, 0xcf, 0xcd, 0x2e, - 0x46, 0xf7, 0x81, 0x4b, 0x34, 0xcf, 0x66, 0xb8, 0x04, 0xc5, 0x65, 0x98, 0xf4, 0xdc, 0x26, 0xa8, - 0xff, 0x43, 0x2a, 0x7e, 0x0a, 0x79, 0x9e, 0xff, 0x7a, 0x47, 0x77, 0xdd, 0xba, 0xde, 0xd3, 0x5b, - 0x66, 0xc7, 0xf4, 0x4c, 0xec, 0xa2, 0x02, 0x80, 0xd1, 0xeb, 0x6b, 0x5d, 0xb3, 0xd3, 0x31, 0x5d, - 0x4a, 0x17, 0x57, 0x53, 0x46, 0xaf, 0x7f, 0x42, 0x05, 0xe8, 0x1e, 0x64, 0xba, 0xb8, 0x6b, 0x3b, - 0x37, 0x5a, 0xeb, 0x86, 0xdc, 0x90, 0x18, 0x05, 0xa4, 0x99, 0x6c, 0x9f, 0x88, 0x94, 0x3f, 0x49, - 0xb0, 0xc2, 0xe9, 0xd1, 0xf7, 0x60, 0x95, 0x5c, 0x76, 0x5a, 0xfd, 0x84, 0x2b, 0x5d, 0x2d, 0x94, - 0x89, 0x60, 0x98, 0xcb, 0xd3, 0xd6, 0xcf, 0xb1, 0xe1, 0x9d, 0x70, 0x90, 0x1a, 0xc0, 0xd1, 0x1e, - 0x24, 0xdc, 0x1e, 0x36, 0xa8, 0x05, 0xaa, 0x16, 0x51, 0x42, 0xe4, 0xd6, 0xa8, 0x14, 0x8a, 0x3e, - 0x80, 0xa4, 0xeb, 0xe9, 0x5e, 0xdf, 0xa5, 0xf9, 0x4d, 0x57, 0xef, 0x46, 0x2b, 0x51, 0x98, 0xca, - 0xe1, 0xca, 0x3d, 0x48, 0x1d, 0x75, 0xf5, 0x2b, 0xd6, 0x32, 0x36, 0x61, 0xd9, 0x24, 0x07, 0x9e, - 0x4b, 0x76, 0x50, 0x76, 0x21, 0xd5, 0xe8, 0xf6, 0xbc, 0x9b, 0x03, 0xd3, 0x7d, 0x43, 0x92, 0xe4, - 0x9a, 0xbf, 0xc4, 0x3c, 0x07, 0x3c, 0x49, 0x44, 0xc2, 0x32, 0xf0, 0x9b, 0x04, 0xe4, 0xd8, 0x95, - 0xae, 0xdb, 0x96, 0x85, 0x0d, 0xcf, 0xb4, 0xad, 0x85, 0x3b, 0x91, 0x2a, 0xe8, 0x44, 0xd5, 0xa8, - 0xd6, 0x31, 0xb4, 0x33, 0xb5, 0x1f, 0x9d, 0x89, 0xfa, 0xd1, 0x3c, 0xa4, 0x53, 0xba, 0x12, 0xd2, - 0x60, 0x1d, 0x5b, 0x86, 0x73, 0xd3, 0x23, 0x48, 0x46, 0xbc, 0x4c, 0x89, 0xdf, 0x9f, 0x83, 0xb8, - 0x11, 0x68, 0x0e, 0xc9, 0xb3, 0x78, 0x44, 0xf8, 0xcd, 0xb6, 0x3d, 0xb9, 0x06, 0x1b, 0x02, 0x27, - 0x17, 0xea, 0x9c, 0x7f, 0x91, 0x20, 0xc9, 0x22, 0x47, 0x08, 0x12, 0x96, 0xde, 0xf5, 0x6b, 0x8b, + // 1982 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x73, 0xdb, 0x58, + 0x15, 0x8f, 0xec, 0xc4, 0x89, 0x8f, 0x1d, 0xc7, 0xbd, 0xf9, 0xa8, 0xab, 0xc5, 0xae, 0xab, 0x2d, + 0xdb, 0x4c, 0x68, 0xed, 0xc6, 0xa5, 0xbb, 0x4b, 0x67, 0x96, 0xc1, 0x71, 0x9c, 0x6d, 0x68, 0xe2, + 0x14, 0xc5, 0x4d, 0x59, 0x06, 0x46, 0x23, 0xcb, 0x37, 0x89, 0xa8, 0x2d, 0x79, 0x25, 0xd9, 0x4b, + 0xd8, 0x97, 0x65, 0x78, 0xe1, 0x85, 0x81, 0xbf, 0x82, 0x17, 0x5e, 0x60, 0x86, 0x47, 0xfe, 0x80, + 0x7d, 0xe4, 0x0d, 0x1e, 0xd9, 0x32, 0xc3, 0x03, 0x7f, 0x05, 0x73, 0x3f, 0x24, 0xcb, 0xf6, 0x95, + 0x3f, 0x16, 0x66, 0xf6, 0xcd, 0xf7, 0xe8, 0x77, 0x7e, 0xe7, 0x43, 0xe7, 0x9e, 0x73, 0x34, 0x86, + 0xa4, 0xde, 0x33, 0x4b, 0x3d, 0xc7, 0xf6, 0x6c, 0x94, 0xed, 0xea, 0xc6, 0xb5, 0x69, 0xe1, 0xd2, + 0x60, 0x5f, 0xef, 0xf4, 0xae, 0xf5, 0x7d, 0xf9, 0xd1, 0x95, 0xe9, 0x5d, 0xf7, 0x5b, 0x25, 0xc3, + 0xee, 0x96, 0xaf, 0xec, 0x2b, 0xbb, 0x4c, 0x81, 0xad, 0xfe, 0x25, 0x3d, 0xd1, 0x03, 0xfd, 0xc5, + 0x08, 0xe4, 0x6a, 0x08, 0x6e, 0x3a, 0xb6, 0x65, 0xd8, 0x0e, 0x7e, 0xd4, 0xc6, 0x83, 0xe0, 0x50, + 0x36, 0x1d, 0xb3, 0xac, 0xf7, 0x4c, 0xb7, 0xdc, 0xc5, 0x9e, 0x5e, 0xf6, 0xed, 0x94, 0x03, 0x1f, + 0xe4, 0x83, 0xf9, 0x29, 0xf0, 0x00, 0x5b, 0x9e, 0x80, 0x43, 0xf9, 0x7b, 0x0c, 0xe0, 0xc2, 0xee, + 0xf4, 0xbb, 0xf8, 0xbc, 0x87, 0x0d, 0xb4, 0x03, 0x89, 0xb6, 0x63, 0x0e, 0xb0, 0x93, 0x93, 0x8a, + 0xd2, 0x6e, 0x52, 0xe5, 0x27, 0x22, 0xbf, 0xd6, 0xad, 0x76, 0x07, 0xe7, 0x62, 0x4c, 0xce, 0x4e, + 0xe8, 0x04, 0x40, 0xf7, 0x3c, 0xc7, 0x6c, 0xf5, 0x3d, 0xec, 0xe6, 0xe2, 0xc5, 0xf8, 0x6e, 0xaa, + 0xf2, 0xb0, 0x34, 0x9e, 0x9b, 0xd2, 0xd0, 0x42, 0xa9, 0x1a, 0xc0, 0xeb, 0x96, 0xe7, 0xdc, 0xa8, + 0x21, 0x7d, 0x74, 0x0a, 0x29, 0x17, 0x1b, 0x0e, 0xf6, 0xb4, 0xb6, 0xee, 0xe9, 0xb9, 0xe5, 0x39, + 0xe8, 0xce, 0x29, 0xfe, 0x50, 0xf7, 0x74, 0x4e, 0xe7, 0x06, 0x02, 0xf9, 0x23, 0xd8, 0x18, 0xb3, + 0x86, 0xb2, 0x10, 0x7f, 0x83, 0x6f, 0x78, 0x70, 0xe4, 0x27, 0xda, 0x82, 0x95, 0x81, 0xde, 0xe9, + 0xfb, 0x81, 0xb1, 0xc3, 0xb3, 0xd8, 0x87, 0x12, 0x51, 0x1f, 0x63, 0x9f, 0xa5, 0x9e, 0x0e, 0xa9, + 0x2b, 0x7f, 0x95, 0x60, 0xfd, 0x94, 0x79, 0x7e, 0x64, 0x76, 0x3c, 0xec, 0xa0, 0x0c, 0xc4, 0xcc, + 0x36, 0x57, 0x8e, 0x99, 0x6d, 0xf4, 0x09, 0x64, 0x3a, 0x7a, 0x0b, 0x77, 0x34, 0x17, 0x77, 0xb0, + 0xe1, 0xd9, 0x4e, 0x2e, 0x46, 0x23, 0xae, 0x4c, 0x46, 0x3c, 0x42, 0x54, 0x3a, 0x21, 0x5a, 0xe7, + 0x5c, 0x89, 0xc5, 0xbd, 0xde, 0x09, 0xcb, 0xe4, 0x1f, 0x00, 0x9a, 0x04, 0x2d, 0x12, 0xbd, 0xf2, + 0x9b, 0x18, 0xa4, 0xea, 0xa4, 0x6a, 0x22, 0x9c, 0x7f, 0x1d, 0xe1, 0xfc, 0xe3, 0x49, 0xe7, 0x43, + 0x34, 0xb3, 0x5d, 0x47, 0xbb, 0x90, 0xa5, 0xd5, 0xea, 0x6a, 0x97, 0x8e, 0xdd, 0xd5, 0x3c, 0xb3, + 0x8b, 0x73, 0xf1, 0xa2, 0xb4, 0x1b, 0x57, 0x33, 0x4c, 0x7e, 0xe4, 0xd8, 0xdd, 0xa6, 0xd9, 0xc5, + 0xe8, 0x3e, 0x70, 0x89, 0xe6, 0xd9, 0x0c, 0xb7, 0x4c, 0x71, 0x69, 0x26, 0x6d, 0xda, 0x04, 0xf5, + 0x7f, 0x48, 0xc5, 0x4f, 0x21, 0xc7, 0xf3, 0x5f, 0xeb, 0xe8, 0xae, 0x5b, 0xd3, 0x7b, 0x7a, 0xcb, + 0xec, 0x98, 0x9e, 0x89, 0x5d, 0x94, 0x07, 0x30, 0x7a, 0x7d, 0xad, 0x6b, 0x76, 0x3a, 0xa6, 0x4b, + 0xe9, 0xe2, 0x6a, 0xd2, 0xe8, 0xf5, 0x4f, 0xa9, 0x00, 0xdd, 0x83, 0x74, 0x17, 0x77, 0x6d, 0xe7, + 0x46, 0x6b, 0xdd, 0x90, 0x1b, 0x12, 0xa3, 0x80, 0x14, 0x93, 0x1d, 0x10, 0x91, 0xf2, 0x27, 0x09, + 0x56, 0x39, 0x3d, 0xfa, 0x1e, 0xac, 0x91, 0xcb, 0x4e, 0xab, 0x9f, 0x70, 0xa5, 0x2a, 0xf9, 0x12, + 0x11, 0x0c, 0x73, 0x79, 0xd6, 0xfa, 0x39, 0x36, 0xbc, 0x53, 0x0e, 0x52, 0x03, 0x38, 0xda, 0x87, + 0x65, 0xb7, 0x87, 0x0d, 0x6a, 0x81, 0xaa, 0x45, 0x94, 0x10, 0xb9, 0x35, 0x2a, 0x85, 0xa2, 0x0f, + 0x20, 0xe1, 0x7a, 0xba, 0xd7, 0x77, 0x69, 0x7e, 0x53, 0x95, 0xbb, 0xd1, 0x4a, 0x14, 0xa6, 0x72, + 0xb8, 0x72, 0x0f, 0x92, 0xc7, 0x5d, 0xfd, 0x8a, 0xb5, 0x8c, 0x2d, 0x58, 0x31, 0xc9, 0x81, 0xe7, + 0x92, 0x1d, 0x94, 0x3d, 0x48, 0xd6, 0xbb, 0x3d, 0xef, 0xe6, 0xd0, 0x74, 0xdf, 0x90, 0x24, 0xb9, + 0xe6, 0x2f, 0x31, 0xcf, 0x01, 0x4f, 0x12, 0x91, 0xb0, 0x0c, 0xfc, 0x76, 0x19, 0xb2, 0xec, 0x4a, + 0xd7, 0x6c, 0xcb, 0xc2, 0x86, 0x67, 0xda, 0xd6, 0xc2, 0x9d, 0x48, 0x15, 0x74, 0xa2, 0x4a, 0x54, + 0xeb, 0x18, 0xda, 0x99, 0xda, 0x8f, 0xce, 0x45, 0xfd, 0x68, 0x1e, 0xd2, 0x29, 0x5d, 0x09, 0x69, + 0xb0, 0x81, 0x2d, 0xc3, 0xb9, 0xe9, 0x11, 0x24, 0x23, 0x5e, 0xa1, 0xc4, 0xef, 0xcf, 0x41, 0x5c, + 0x0f, 0x34, 0x87, 0xe4, 0x19, 0x3c, 0x22, 0xfc, 0x66, 0xdb, 0x9e, 0x5c, 0x85, 0x4d, 0x81, 0x93, + 0x0b, 0x75, 0xce, 0xbf, 0x48, 0x90, 0x60, 0x91, 0x23, 0x04, 0xcb, 0x96, 0xde, 0xf5, 0x6b, 0x8b, 0xfe, 0xa6, 0x95, 0x81, 0x07, 0xa6, 0x11, 0x54, 0x00, 0x3b, 0xa1, 0x67, 0x00, 0x98, 0x94, 0x9c, - 0xd6, 0x36, 0xdd, 0x37, 0xb4, 0x15, 0xa4, 0xab, 0xef, 0x08, 0xba, 0x91, 0x5f, 0x96, 0x6a, 0x0a, - 0x07, 0x15, 0xba, 0x0f, 0x60, 0x04, 0x59, 0xce, 0x2f, 0x53, 0x5d, 0x65, 0xf6, 0xfb, 0x50, 0x43, - 0x5a, 0xca, 0x7f, 0x24, 0xc8, 0x35, 0xb1, 0xf7, 0x99, 0xed, 0xbc, 0x39, 0xb2, 0x3c, 0xec, 0x5c, - 0xea, 0x86, 0x38, 0x80, 0x02, 0x80, 0xc5, 0x70, 0x9a, 0xd9, 0xe6, 0x41, 0xa4, 0xb8, 0xe4, 0xa8, - 0x4d, 0x52, 0x65, 0xf6, 0x58, 0x09, 0xa7, 0x54, 0xf2, 0x73, 0xac, 0xb6, 0x23, 0xcb, 0x70, 0xdc, - 0xf8, 0xb4, 0xda, 0xfe, 0x1f, 0xab, 0x44, 0xf9, 0x73, 0x0c, 0xd2, 0xa1, 0x8e, 0x82, 0x1e, 0xc1, - 0x72, 0xcf, 0xfe, 0x8c, 0xdf, 0xd6, 0x6c, 0xf5, 0xf6, 0xa4, 0x77, 0x2f, 0xc9, 0x63, 0x95, 0xa1, - 0xd0, 0x9e, 0xdf, 0x34, 0x62, 0x51, 0xaf, 0x29, 0x68, 0x30, 0xbc, 0xa3, 0x10, 0x5f, 0x0c, 0xd2, - 0x7e, 0x69, 0xb3, 0x4a, 0xa9, 0xec, 0x80, 0xde, 0x85, 0x35, 0xf3, 0xca, 0x32, 0x87, 0x77, 0x29, - 0x41, 0xab, 0x29, 0xe3, 0x0b, 0xe9, 0x95, 0xab, 0xc2, 0xca, 0x80, 0xbe, 0x39, 0x97, 0x5f, 0xb5, - 0x7c, 0xd4, 0xab, 0x55, 0x7d, 0x20, 0xfa, 0x11, 0xa0, 0xe0, 0x25, 0xf9, 0x09, 0x75, 0xf3, 0x49, - 0xaa, 0xae, 0xcc, 0xce, 0xbd, 0x7a, 0xcb, 0x1a, 0x93, 0xb8, 0xca, 0x1f, 0x62, 0xc1, 0x46, 0xc0, - 0x1a, 0x2a, 0xaa, 0xc0, 0x86, 0xdd, 0x72, 0xb1, 0x33, 0xc0, 0x6d, 0xed, 0x0a, 0x5b, 0xd8, 0xd1, - 0x69, 0xfd, 0xb1, 0x0e, 0x89, 0xfc, 0x47, 0x1f, 0x07, 0x4f, 0xd0, 0x77, 0x61, 0x99, 0xf4, 0x60, - 0x96, 0xb7, 0x6c, 0xb5, 0x38, 0xb5, 0x63, 0x63, 0x95, 0x81, 0xd1, 0x3b, 0x90, 0xa2, 0x39, 0xd4, - 0x1c, 0x7c, 0xc9, 0xd3, 0xb7, 0x4a, 0x05, 0x2a, 0xbe, 0x44, 0x1f, 0x0e, 0x93, 0xc3, 0x2a, 0xab, - 0x18, 0xb9, 0x70, 0xb1, 0x29, 0x10, 0xa4, 0xe8, 0xb5, 0x30, 0x45, 0x2c, 0xc3, 0x3b, 0xb3, 0x53, - 0xc4, 0xe9, 0x04, 0x89, 0xb2, 0x21, 0x13, 0xb6, 0x18, 0xd5, 0x05, 0x84, 0x73, 0xe0, 0x89, 0x9f, - 0xa1, 0x38, 0xcd, 0x50, 0x61, 0x5a, 0x30, 0x7e, 0x82, 0x94, 0xdf, 0x4b, 0xb0, 0x2d, 0x76, 0x6f, - 0x21, 0xdb, 0x1f, 0x8d, 0xda, 0x7e, 0x30, 0x5f, 0x0e, 0x82, 0xd7, 0xc4, 0x2f, 0x7e, 0x22, 0xb8, - 0xf8, 0x8a, 0x03, 0x99, 0xf0, 0xe6, 0x21, 0x74, 0xa6, 0x09, 0x19, 0x23, 0xb4, 0x91, 0xf0, 0x1b, - 0xb5, 0x1b, 0x59, 0x19, 0x13, 0x3b, 0x8c, 0x3a, 0xa2, 0xaf, 0xf4, 0x01, 0x85, 0x91, 0x3c, 0x0d, - 0x75, 0x58, 0xe3, 0x84, 0x1a, 0xbb, 0x85, 0x6c, 0x3d, 0x29, 0x4e, 0x37, 0xa3, 0x66, 0xba, 0x61, - 0xf7, 0x65, 0x58, 0xfd, 0xb4, 0xaf, 0x5b, 0x9e, 0xe9, 0xdd, 0xf0, 0x4d, 0x28, 0x38, 0x2b, 0xbb, - 0x90, 0xbd, 0xc0, 0x8e, 0x4b, 0x9a, 0x2a, 0xfe, 0xb4, 0x8f, 0x5d, 0x0f, 0xe5, 0x61, 0x65, 0xc0, - 0x24, 0x3c, 0x5e, 0xff, 0xa8, 0xfc, 0x0c, 0xd6, 0x03, 0xac, 0xdb, 0xb3, 0x2d, 0x17, 0x93, 0x45, - 0xcb, 0xe9, 0x5b, 0x64, 0x09, 0xd4, 0x42, 0x19, 0x4a, 0x73, 0x59, 0x93, 0x24, 0xea, 0x01, 0xac, - 0xfb, 0x10, 0x9f, 0x97, 0xbd, 0xbe, 0x2c, 0x17, 0x73, 0x4e, 0xa5, 0x09, 0x1b, 0xc7, 0xa6, 0xeb, - 0xf1, 0x40, 0x5c, 0xdf, 0x9f, 0x0f, 0x20, 0x79, 0x49, 0x97, 0x58, 0x1e, 0xfb, 0xdd, 0x19, 0x6b, - 0xba, 0xca, 0xe1, 0xca, 0x09, 0x6c, 0x8e, 0xf2, 0x71, 0x9f, 0x9f, 0xc2, 0x2a, 0x67, 0x20, 0xe9, - 0x24, 0xb7, 0xe6, 0x4e, 0x24, 0xa5, 0x1a, 0x40, 0x95, 0x1f, 0xc2, 0x2d, 0x42, 0x47, 0xb7, 0xea, - 0xc0, 0xb9, 0xa7, 0x63, 0xce, 0x15, 0xa6, 0xae, 0xe1, 0x81, 0x6b, 0x75, 0x40, 0x61, 0x2e, 0xee, - 0xd8, 0x23, 0x48, 0xb2, 0x15, 0x9a, 0xbb, 0xb5, 0x55, 0xa6, 0xc7, 0x31, 0x2a, 0x95, 0x83, 0x94, - 0x17, 0xb0, 0x59, 0x77, 0xb0, 0xee, 0x61, 0xdf, 0x57, 0xee, 0xd3, 0x13, 0x58, 0xe1, 0x4e, 0x70, - 0xa7, 0xa6, 0x84, 0xe7, 0x23, 0x95, 0x63, 0xd8, 0x1a, 0x23, 0xe3, 0x4e, 0x7d, 0x2d, 0xb6, 0xa7, - 0xb0, 0x79, 0x80, 0x3b, 0x78, 0xc2, 0xb5, 0x02, 0x80, 0x5f, 0xce, 0xc1, 0x57, 0x4d, 0x8a, 0x4b, - 0x8e, 0xda, 0xca, 0x6d, 0xd8, 0x1a, 0x53, 0x63, 0x4e, 0x28, 0xff, 0x96, 0xe0, 0xee, 0xab, 0x5e, - 0x7b, 0xe8, 0x5e, 0xcd, 0xb2, 0x6c, 0x8f, 0xf6, 0x66, 0x77, 0x3e, 0x6e, 0xd4, 0x86, 0xb4, 0x3e, - 0x54, 0xe2, 0x5f, 0x4d, 0xfb, 0x93, 0xb1, 0xcc, 0x30, 0x53, 0x0e, 0x89, 0xd8, 0x74, 0x0f, 0xd3, - 0xca, 0xdf, 0x87, 0xdc, 0x38, 0x60, 0xa1, 0xf9, 0xae, 0x40, 0x29, 0xda, 0x01, 0x9e, 0x0c, 0x13, - 0xee, 0x8c, 0x60, 0xd8, 0x84, 0x9f, 0x2f, 0x0b, 0xc1, 0xbe, 0x10, 0x9b, 0x67, 0x5f, 0x50, 0xbe, - 0x05, 0xb2, 0xc8, 0x14, 0x77, 0xe4, 0x12, 0x36, 0x6a, 0x9e, 0xa7, 0x1b, 0xd7, 0x7c, 0x88, 0xcf, - 0xe7, 0xc2, 0x63, 0x48, 0xb2, 0x49, 0xc6, 0x5b, 0x66, 0xf4, 0x52, 0xc0, 0x71, 0xca, 0x36, 0x6c, - 0x8e, 0xda, 0xe1, 0xf6, 0x9f, 0xc3, 0xc6, 0x01, 0x5e, 0xd8, 0xbe, 0xdf, 0xcc, 0x63, 0xc3, 0x66, - 0x4e, 0x2c, 0x8c, 0x32, 0x71, 0x0b, 0xbf, 0x95, 0xa0, 0xc0, 0x4c, 0x4f, 0x2c, 0x1a, 0xf3, 0x19, - 0x3b, 0x85, 0x5b, 0x13, 0xb3, 0x9a, 0xc7, 0x3d, 0xcf, 0x36, 0x93, 0x1b, 0x1f, 0xd2, 0x4a, 0x09, - 0x8a, 0x51, 0x0e, 0x71, 0x9f, 0x55, 0x28, 0xb0, 0x58, 0xbe, 0xa6, 0xcb, 0xa2, 0xfc, 0x94, 0xa0, - 0x18, 0xc5, 0xc9, 0xad, 0xae, 0xc3, 0x1a, 0x5f, 0x2c, 0x98, 0x15, 0xe5, 0x1a, 0xb2, 0xbe, 0x80, - 0x77, 0x92, 0x0b, 0xd8, 0x1c, 0x99, 0x65, 0x1a, 0xff, 0x0a, 0x66, 0xcd, 0xee, 0xfe, 0xf4, 0x91, - 0xc6, 0xb9, 0x50, 0x77, 0x42, 0xa6, 0x3c, 0x84, 0x74, 0xe3, 0x17, 0xd8, 0x98, 0xb3, 0xc7, 0x94, - 0x20, 0xc3, 0xd0, 0xdc, 0xab, 0x1c, 0xc4, 0xfb, 0x4e, 0xc7, 0xbf, 0x9d, 0x7d, 0xa7, 0xb3, 0x7b, - 0x1f, 0x96, 0x69, 0x9d, 0xa3, 0x0c, 0xac, 0xbe, 0x3c, 0x7d, 0xdd, 0x50, 0xb5, 0xd3, 0x66, 0x6e, - 0x09, 0xad, 0x41, 0x8a, 0x9f, 0x0e, 0x0f, 0x73, 0xd2, 0xee, 0xfb, 0x90, 0x0e, 0x6d, 0x34, 0x08, - 0x41, 0xf6, 0xe2, 0xf4, 0xf8, 0xd5, 0x49, 0x43, 0x7b, 0xd9, 0x68, 0x1e, 0x1c, 0x35, 0x3f, 0xce, - 0x2d, 0xa1, 0x0d, 0x58, 0xe7, 0xb2, 0xda, 0xf9, 0x79, 0xad, 0xfe, 0xbc, 0x71, 0x90, 0x93, 0x76, - 0x2f, 0x60, 0x4b, 0xb8, 0x8d, 0xa0, 0x02, 0xdc, 0x69, 0x36, 0xce, 0x5f, 0x9f, 0xaa, 0x2f, 0xb4, - 0xa3, 0xe6, 0x79, 0x43, 0x3d, 0xac, 0xd5, 0xc3, 0x64, 0x45, 0x90, 0x27, 0x1f, 0x87, 0x78, 0xbf, - 0x90, 0x82, 0xa5, 0x85, 0xf1, 0x6d, 0xc0, 0xfa, 0x49, 0xad, 0xfe, 0xfc, 0xa8, 0x39, 0xe6, 0x92, - 0x2f, 0x54, 0x5f, 0x35, 0x9b, 0x44, 0x28, 0xa1, 0x2d, 0xb8, 0xe5, 0x0b, 0xcf, 0x5e, 0x9d, 0x11, - 0x70, 0xe3, 0x20, 0x17, 0x43, 0xdb, 0x80, 0x7c, 0xf1, 0x79, 0x43, 0x3d, 0x39, 0x6a, 0xd6, 0xce, - 0x1b, 0x07, 0xb9, 0x38, 0xba, 0x0d, 0x1b, 0xe3, 0x72, 0xc2, 0x93, 0xa8, 0xfe, 0x11, 0x20, 0xeb, - 0x77, 0x6e, 0x36, 0xda, 0xd1, 0x4b, 0x58, 0xe1, 0xe3, 0x1d, 0x95, 0x04, 0xf7, 0x7c, 0x64, 0xf3, - 0x90, 0xef, 0x4d, 0x41, 0xf0, 0x32, 0x5b, 0x42, 0x9f, 0x00, 0x0c, 0x47, 0x27, 0x7a, 0x77, 0x52, - 0x65, 0x62, 0x48, 0xcb, 0xf7, 0xa7, 0x83, 0x02, 0x6a, 0x0d, 0x32, 0xe1, 0x85, 0x01, 0x7d, 0x5b, - 0xac, 0x37, 0xb6, 0xa0, 0xc8, 0xef, 0xcd, 0x82, 0x05, 0x06, 0x5a, 0xb0, 0x36, 0x32, 0x64, 0x91, - 0x40, 0x55, 0x34, 0xd2, 0xe5, 0x07, 0x33, 0x71, 0x61, 0x1b, 0x23, 0x33, 0x54, 0x64, 0x43, 0x34, - 0x9b, 0x45, 0x36, 0xc4, 0xc3, 0x78, 0x09, 0xfd, 0x4a, 0x82, 0x7c, 0xd4, 0x98, 0x42, 0x7b, 0x0b, - 0xcf, 0x54, 0xb9, 0xba, 0x88, 0x0a, 0xbf, 0xb7, 0x36, 0xa0, 0xc9, 0xd1, 0x84, 0xbe, 0x33, 0x83, - 0x29, 0x3c, 0x2b, 0xe5, 0x87, 0xf3, 0x81, 0xb9, 0x41, 0x0d, 0x32, 0xe1, 0x29, 0x24, 0xaa, 0x0e, - 0xc1, 0x34, 0x14, 0x55, 0x87, 0x70, 0x98, 0xd1, 0xf2, 0x0b, 0x0f, 0x21, 0x91, 0x01, 0xc1, 0xb8, - 0x93, 0xdf, 0x9b, 0x05, 0x0b, 0x0c, 0x7c, 0x0e, 0xdb, 0xe2, 0xd9, 0x81, 0x2a, 0x51, 0x4e, 0x46, - 0xcc, 0x10, 0xf9, 0xf1, 0xfc, 0x0a, 0x3c, 0x7d, 0x9f, 0xc3, 0xb6, 0x78, 0x84, 0x88, 0x8c, 0x4f, - 0x1d, 0x60, 0x22, 0xe3, 0xd3, 0xa7, 0x13, 0x7a, 0x01, 0x49, 0xfe, 0x41, 0x25, 0xf8, 0x7a, 0x18, - 0x99, 0x5b, 0x72, 0x29, 0x1a, 0xc0, 0xc9, 0x1a, 0x90, 0x20, 0x13, 0x04, 0x89, 0x76, 0xfd, 0xe1, - 0x1c, 0x92, 0x8b, 0x51, 0x8f, 0x19, 0xcd, 0xfe, 0x8f, 0xbf, 0xfc, 0xaa, 0x28, 0xfd, 0xe3, 0xab, - 0xe2, 0xd2, 0x17, 0x6f, 0x8b, 0xd2, 0x97, 0x6f, 0x8b, 0xd2, 0xdf, 0xde, 0x16, 0xa5, 0x7f, 0xbe, - 0x2d, 0x4a, 0xbf, 0xfb, 0x57, 0x71, 0xe9, 0x27, 0xcf, 0x16, 0xf8, 0x9f, 0x8a, 0x99, 0x09, 0xfe, - 0x66, 0x6a, 0x25, 0xe9, 0x7f, 0x4c, 0x4f, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x45, 0x5c, - 0x79, 0x38, 0x1b, 0x00, 0x00, + 0xd6, 0x36, 0xdd, 0x37, 0xb4, 0x15, 0xa4, 0x2a, 0xef, 0x08, 0xba, 0x91, 0x5f, 0x96, 0x6a, 0x12, + 0x07, 0x15, 0x7a, 0x00, 0x60, 0x04, 0x59, 0xce, 0xad, 0x50, 0x5d, 0x65, 0xf6, 0xfb, 0x50, 0x43, + 0x5a, 0xca, 0x7f, 0x24, 0xc8, 0x36, 0xb0, 0xf7, 0x99, 0xed, 0xbc, 0x39, 0xb6, 0x3c, 0xec, 0x5c, + 0xea, 0x86, 0x38, 0x80, 0x3c, 0x80, 0xc5, 0x70, 0x9a, 0xd9, 0xe6, 0x41, 0x24, 0xb9, 0xe4, 0xb8, + 0x4d, 0x52, 0x65, 0xf6, 0x58, 0x09, 0x27, 0x55, 0xf2, 0x73, 0xac, 0xb6, 0x23, 0xcb, 0x70, 0xdc, + 0xf8, 0xb4, 0xda, 0xfe, 0x1f, 0xab, 0x44, 0xf9, 0x73, 0x0c, 0x52, 0xa1, 0x8e, 0x82, 0x1e, 0xc1, + 0x4a, 0xcf, 0xfe, 0x8c, 0xdf, 0xd6, 0x4c, 0xe5, 0xf6, 0xa4, 0x77, 0x2f, 0xc9, 0x63, 0x95, 0xa1, + 0xd0, 0xbe, 0xdf, 0x34, 0x62, 0x51, 0xaf, 0x29, 0x68, 0x30, 0xbc, 0xa3, 0x10, 0x5f, 0x0c, 0xd2, + 0x7e, 0x69, 0xb3, 0x4a, 0xaa, 0xec, 0x80, 0xde, 0x85, 0x75, 0xf3, 0xca, 0x32, 0x87, 0x77, 0x69, + 0x99, 0x56, 0x53, 0xda, 0x17, 0xd2, 0x2b, 0x57, 0x81, 0xd5, 0x01, 0x7d, 0x73, 0x2e, 0xbf, 0x6a, + 0xb9, 0xa8, 0x57, 0xab, 0xfa, 0x40, 0xf4, 0x23, 0x40, 0xc1, 0x4b, 0xf2, 0x13, 0xea, 0xe6, 0x12, + 0x54, 0x5d, 0x99, 0x9d, 0x7b, 0xf5, 0x96, 0x35, 0x26, 0x71, 0x95, 0x3f, 0xc4, 0x82, 0x8d, 0x80, + 0x35, 0x54, 0x54, 0x86, 0x4d, 0xbb, 0xe5, 0x62, 0x67, 0x80, 0xdb, 0xda, 0x15, 0xb6, 0xb0, 0xa3, + 0xd3, 0xfa, 0x63, 0x1d, 0x12, 0xf9, 0x8f, 0x3e, 0x0e, 0x9e, 0xa0, 0xef, 0xc2, 0x0a, 0xe9, 0xc1, + 0x2c, 0x6f, 0x99, 0x4a, 0x61, 0x6a, 0xc7, 0xc6, 0x2a, 0x03, 0xa3, 0x77, 0x20, 0x49, 0x73, 0xa8, + 0x39, 0xf8, 0x92, 0xa7, 0x6f, 0x8d, 0x0a, 0x54, 0x7c, 0x89, 0x3e, 0x1c, 0x26, 0x87, 0x55, 0x56, + 0x21, 0x72, 0xe1, 0x62, 0x53, 0x20, 0x48, 0xd1, 0x6b, 0x61, 0x8a, 0x58, 0x86, 0x77, 0x67, 0xa7, + 0x88, 0xd3, 0x09, 0x12, 0x65, 0x43, 0x3a, 0x6c, 0x31, 0xaa, 0x0b, 0x08, 0xe7, 0xc0, 0x13, 0x3f, + 0x43, 0x71, 0x9a, 0xa1, 0xfc, 0xb4, 0x60, 0xfc, 0x04, 0x29, 0xbf, 0x96, 0x60, 0x47, 0xec, 0xde, + 0x42, 0xb6, 0x3f, 0x1a, 0xb5, 0xfd, 0x60, 0xbe, 0x1c, 0x04, 0x5e, 0x38, 0x90, 0x0e, 0xef, 0x19, + 0x42, 0xd3, 0x0d, 0x48, 0x1b, 0xa1, 0xfd, 0x83, 0xdf, 0x9f, 0xbd, 0xc8, 0x3a, 0x98, 0xd8, 0x58, + 0xd4, 0x11, 0x7d, 0xa5, 0x0f, 0x28, 0x8c, 0xe4, 0x41, 0xd7, 0x60, 0x9d, 0x13, 0x6a, 0xec, 0xce, + 0xb1, 0x65, 0xa4, 0x30, 0xdd, 0x8c, 0x9a, 0xee, 0x86, 0xdd, 0x97, 0x61, 0xed, 0xd3, 0xbe, 0x6e, + 0x79, 0xa6, 0x77, 0xc3, 0xf7, 0x9e, 0xe0, 0xac, 0xec, 0x41, 0xe6, 0x02, 0x3b, 0x2e, 0x69, 0xa1, + 0xf8, 0xd3, 0x3e, 0x76, 0x3d, 0x94, 0x83, 0xd5, 0x01, 0x93, 0xf0, 0x78, 0xfd, 0xa3, 0xf2, 0x33, + 0xd8, 0x08, 0xb0, 0x6e, 0xcf, 0xb6, 0x5c, 0x4c, 0xd6, 0x2a, 0xa7, 0x6f, 0x91, 0x95, 0x4f, 0x0b, + 0x65, 0x28, 0xc5, 0x65, 0x0d, 0x92, 0xa8, 0x07, 0xb0, 0xe1, 0x43, 0x7c, 0x5e, 0xf6, 0xb2, 0x32, + 0x5c, 0xcc, 0x39, 0x95, 0x06, 0x6c, 0x9e, 0x98, 0xae, 0xc7, 0x03, 0x71, 0x7d, 0x7f, 0x3e, 0x80, + 0xc4, 0x25, 0x5d, 0x59, 0x79, 0xec, 0x77, 0x67, 0x2c, 0xe5, 0x2a, 0x87, 0x2b, 0xa7, 0xb0, 0x35, + 0xca, 0xc7, 0x7d, 0x7e, 0x0a, 0x6b, 0x9c, 0x81, 0xa4, 0x93, 0xdc, 0x91, 0x3b, 0x91, 0x94, 0x6a, + 0x00, 0x55, 0x7e, 0x08, 0xb7, 0x08, 0x1d, 0xdd, 0xa1, 0x03, 0xe7, 0x9e, 0x8e, 0x39, 0x97, 0x9f, + 0xba, 0x74, 0x07, 0xae, 0xd5, 0x00, 0x85, 0xb9, 0xb8, 0x63, 0x8f, 0x20, 0xc1, 0x16, 0x66, 0xee, + 0xd6, 0x76, 0x89, 0x1e, 0xc7, 0xa8, 0x54, 0x0e, 0x52, 0x5e, 0xc0, 0x56, 0xcd, 0xc1, 0xba, 0x87, + 0x7d, 0x5f, 0xb9, 0x4f, 0x4f, 0x60, 0x95, 0x3b, 0xc1, 0x9d, 0x9a, 0x12, 0x9e, 0x8f, 0x54, 0x4e, + 0x60, 0x7b, 0x8c, 0x8c, 0x3b, 0xf5, 0xb5, 0xd8, 0x9e, 0xc2, 0xd6, 0x21, 0xee, 0xe0, 0x09, 0xd7, + 0xf2, 0x00, 0x7e, 0x39, 0x07, 0xdf, 0x30, 0x49, 0x2e, 0x39, 0x6e, 0x2b, 0xb7, 0x61, 0x7b, 0x4c, + 0x8d, 0x39, 0xa1, 0xfc, 0x5b, 0x82, 0xbb, 0xaf, 0x7a, 0xed, 0xa1, 0x7b, 0x55, 0xcb, 0xb2, 0x3d, + 0xda, 0x89, 0xdd, 0xf9, 0xb8, 0x51, 0x1b, 0x52, 0xfa, 0x50, 0x89, 0x7f, 0x23, 0x1d, 0x4c, 0xc6, + 0x32, 0xc3, 0x4c, 0x29, 0x24, 0x62, 0xb3, 0x3c, 0x4c, 0x2b, 0x7f, 0x1f, 0xb2, 0xe3, 0x80, 0x85, + 0xa6, 0xb9, 0x02, 0xc5, 0x68, 0x07, 0x78, 0x32, 0x4c, 0xb8, 0x33, 0x82, 0x61, 0xf3, 0x7c, 0xbe, + 0x2c, 0x04, 0xdb, 0x41, 0x6c, 0x9e, 0xed, 0x40, 0xf9, 0x16, 0xc8, 0x22, 0x53, 0xdc, 0x91, 0x4b, + 0xd8, 0xac, 0x7a, 0x9e, 0x6e, 0x5c, 0xf3, 0x91, 0x3d, 0x9f, 0x0b, 0x8f, 0x21, 0xc1, 0xe6, 0x16, + 0x6f, 0x99, 0xd1, 0x2b, 0x00, 0xc7, 0x29, 0x3b, 0xb0, 0x35, 0x6a, 0x87, 0xdb, 0x7f, 0x0e, 0x9b, + 0x87, 0x78, 0x61, 0xfb, 0x7e, 0x33, 0x8f, 0x0d, 0x9b, 0x39, 0xb1, 0x30, 0xca, 0xc4, 0x2d, 0xfc, + 0x4e, 0x82, 0x3c, 0x33, 0x3d, 0xb1, 0x56, 0xcc, 0x67, 0xec, 0x0c, 0x6e, 0x4d, 0x4c, 0x66, 0x1e, + 0xf7, 0x3c, 0xbb, 0x4b, 0x76, 0x7c, 0x24, 0x2b, 0x45, 0x28, 0x44, 0x39, 0xc4, 0x7d, 0x56, 0x21, + 0xcf, 0x62, 0xf9, 0x9a, 0x2e, 0x8b, 0xf2, 0x53, 0x84, 0x42, 0x14, 0x27, 0xb7, 0xba, 0x01, 0xeb, + 0x7c, 0x8d, 0x60, 0x56, 0x94, 0x6b, 0xc8, 0xf8, 0x02, 0xde, 0x49, 0x2e, 0x60, 0x6b, 0x64, 0x96, + 0x69, 0xfc, 0x9b, 0x97, 0x35, 0xbb, 0xfb, 0xd3, 0x47, 0x1a, 0xe7, 0x42, 0xdd, 0x09, 0x99, 0xf2, + 0x10, 0x52, 0xf5, 0x5f, 0x60, 0x63, 0xce, 0x1e, 0x53, 0x84, 0x34, 0x43, 0x73, 0xaf, 0xb2, 0x10, + 0xef, 0x3b, 0x1d, 0xff, 0x76, 0xf6, 0x9d, 0xce, 0xde, 0x7d, 0x58, 0xa1, 0x75, 0x8e, 0xd2, 0xb0, + 0xf6, 0xf2, 0xec, 0x75, 0x5d, 0xd5, 0xce, 0x1a, 0xd9, 0x25, 0xb4, 0x0e, 0x49, 0x7e, 0x3a, 0x3a, + 0xca, 0x4a, 0x7b, 0xef, 0x43, 0x2a, 0xb4, 0xbf, 0x20, 0x04, 0x99, 0x8b, 0xb3, 0x93, 0x57, 0xa7, + 0x75, 0xed, 0x65, 0xbd, 0x71, 0x78, 0xdc, 0xf8, 0x38, 0xbb, 0x84, 0x36, 0x61, 0x83, 0xcb, 0xaa, + 0xcd, 0x66, 0xb5, 0xf6, 0xbc, 0x7e, 0x98, 0x95, 0xf6, 0x2e, 0x60, 0x5b, 0xb8, 0x7b, 0xa0, 0x3c, + 0xdc, 0x69, 0xd4, 0x9b, 0xaf, 0xcf, 0xd4, 0x17, 0xda, 0x71, 0xa3, 0x59, 0x57, 0x8f, 0xaa, 0xb5, + 0x30, 0x59, 0x01, 0xe4, 0xc9, 0xc7, 0x21, 0xde, 0x2f, 0xa4, 0x60, 0x69, 0x61, 0x7c, 0x9b, 0xb0, + 0x71, 0x5a, 0xad, 0x3d, 0x3f, 0x6e, 0x8c, 0xb9, 0xe4, 0x0b, 0xd5, 0x57, 0x8d, 0x06, 0x11, 0x4a, + 0x68, 0x1b, 0x6e, 0xf9, 0xc2, 0xf3, 0x57, 0xe7, 0x04, 0x5c, 0x3f, 0xcc, 0xc6, 0xd0, 0x0e, 0x20, + 0x5f, 0xdc, 0xac, 0xab, 0xa7, 0xc7, 0x8d, 0x6a, 0xb3, 0x7e, 0x98, 0x8d, 0xa3, 0xdb, 0xb0, 0x39, + 0x2e, 0x27, 0x3c, 0xcb, 0x95, 0x3f, 0x02, 0x64, 0xfc, 0xce, 0xcd, 0x46, 0x3b, 0x7a, 0x09, 0xab, + 0x7c, 0xbc, 0xa3, 0xa2, 0xe0, 0x9e, 0x8f, 0x6c, 0x1e, 0xf2, 0xbd, 0x29, 0x08, 0x5e, 0x66, 0x4b, + 0xe8, 0x13, 0x80, 0xe1, 0xe8, 0x44, 0xef, 0x4e, 0xaa, 0x4c, 0x0c, 0x69, 0xf9, 0xfe, 0x74, 0x50, + 0x40, 0xad, 0x41, 0x3a, 0xbc, 0x30, 0xa0, 0x6f, 0x8b, 0xf5, 0xc6, 0x16, 0x14, 0xf9, 0xbd, 0x59, + 0xb0, 0xc0, 0x40, 0x0b, 0xd6, 0x47, 0x86, 0x2c, 0x12, 0xa8, 0x8a, 0x46, 0xba, 0xfc, 0x60, 0x26, + 0x2e, 0x6c, 0x63, 0x64, 0x86, 0x8a, 0x6c, 0x88, 0x66, 0xb3, 0xc8, 0x86, 0x78, 0x18, 0x2f, 0xa1, + 0x5f, 0x49, 0x90, 0x8b, 0x1a, 0x53, 0x68, 0x7f, 0xe1, 0x99, 0x2a, 0x57, 0x16, 0x51, 0xe1, 0xf7, + 0xd6, 0x06, 0x34, 0x39, 0x9a, 0xd0, 0x77, 0x66, 0x30, 0x85, 0x67, 0xa5, 0xfc, 0x70, 0x3e, 0x30, + 0x37, 0xa8, 0x41, 0x3a, 0x3c, 0x85, 0x44, 0xd5, 0x21, 0x98, 0x86, 0xa2, 0xea, 0x10, 0x0e, 0x33, + 0x5a, 0x7e, 0xe1, 0x21, 0x24, 0x32, 0x20, 0x18, 0x77, 0xf2, 0x7b, 0xb3, 0x60, 0x81, 0x81, 0xcf, + 0x61, 0x47, 0x3c, 0x3b, 0x50, 0x39, 0xca, 0xc9, 0x88, 0x19, 0x22, 0x3f, 0x9e, 0x5f, 0x81, 0xa7, + 0xef, 0x73, 0xd8, 0x11, 0x8f, 0x10, 0x91, 0xf1, 0xa9, 0x03, 0x4c, 0x64, 0x7c, 0xfa, 0x74, 0x42, + 0x2f, 0x20, 0xc1, 0x3f, 0xa8, 0x04, 0x5f, 0x0f, 0x23, 0x73, 0x4b, 0x2e, 0x46, 0x03, 0x38, 0x59, + 0x1d, 0x96, 0xc9, 0x04, 0x41, 0xa2, 0x5d, 0x7f, 0x38, 0x87, 0xe4, 0x42, 0xd4, 0x63, 0x46, 0x73, + 0xf0, 0xe3, 0x2f, 0xbf, 0x2a, 0x48, 0xff, 0xf8, 0xaa, 0xb0, 0xf4, 0xc5, 0xdb, 0x82, 0xf4, 0xe5, + 0xdb, 0x82, 0xf4, 0xb7, 0xb7, 0x05, 0xe9, 0x9f, 0x6f, 0x0b, 0xd2, 0xef, 0xff, 0x55, 0x58, 0xfa, + 0xc9, 0xb3, 0x05, 0xfe, 0x95, 0x62, 0x66, 0x82, 0x3f, 0x95, 0x5a, 0x09, 0xfa, 0x8f, 0xd2, 0x93, + 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xba, 0xb8, 0x84, 0xff, 0x26, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3787,15 +3778,6 @@ func (m *NetworkInterfaceStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if len(m.Ips) > 0 { - for iNdEx := len(m.Ips) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Ips[iNdEx]) - copy(dAtA[i:], m.Ips[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.Ips[iNdEx]))) - i-- - dAtA[i] = 0x22 - } - } if m.State != 0 { i = encodeVarintApi(dAtA, i, uint64(m.State)) i-- @@ -5100,12 +5082,6 @@ func (m *NetworkInterfaceStatus) Size() (n int) { if m.State != 0 { n += 1 + sovApi(uint64(m.State)) } - if len(m.Ips) > 0 { - for _, s := range m.Ips { - l = len(s) - n += 1 + l + sovApi(uint64(l)) - } - } return n } @@ -5760,7 +5736,6 @@ func (this *NetworkInterfaceStatus) String() string { `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Handle:` + fmt.Sprintf("%v", this.Handle) + `,`, `State:` + fmt.Sprintf("%v", this.State) + `,`, - `Ips:` + fmt.Sprintf("%v", this.Ips) + `,`, `}`, }, "") return s @@ -8929,38 +8904,6 @@ func (m *NetworkInterfaceStatus) Unmarshal(dAtA []byte) error { break } } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ips", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowApi - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthApi - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthApi - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Ips = append(m.Ips, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipApi(dAtA[iNdEx:]) diff --git a/iri/apis/machine/v1alpha1/api.proto b/iri/apis/machine/v1alpha1/api.proto index ac22fc9f2..cc2c59f6f 100644 --- a/iri/apis/machine/v1alpha1/api.proto +++ b/iri/apis/machine/v1alpha1/api.proto @@ -131,7 +131,6 @@ message NetworkInterfaceStatus { string name = 1; string handle = 2; NetworkInterfaceState state = 3; - repeated string ips = 4; } enum NetworkInterfaceState { diff --git a/poollet/machinepoollet/controllers/machine_controller.go b/poollet/machinepoollet/controllers/machine_controller.go index ab35bd4ab..2d21cb08e 100644 --- a/poollet/machinepoollet/controllers/machine_controller.go +++ b/poollet/machinepoollet/controllers/machine_controller.go @@ -7,9 +7,7 @@ import ( "context" "errors" "fmt" - "slices" "strconv" - "time" "github.com/go-logr/logr" "golang.org/x/exp/maps" @@ -517,10 +515,6 @@ func (r *MachineReconciler) updateNetworkInterfaceStatus( errs = append(errs, err) } } - - if err := r.updateNetworkInterfaceStatusFromIRIStatus(ctx, nic, iriNicStatus); err != nil { - errs = append(errs, err) - } } for _, nic := range unhandledNicByUID { @@ -534,39 +528,6 @@ func (r *MachineReconciler) updateNetworkInterfaceStatus( return errors.Join(errs...) } -var iriNetworkInterfaceStateToNetworkInterfaceState = map[iri.NetworkInterfaceState]networkingv1alpha1.NetworkInterfaceState{ - iri.NetworkInterfaceState_NETWORK_INTERFACE_PENDING: networkingv1alpha1.NetworkInterfaceStatePending, - iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED: networkingv1alpha1.NetworkInterfaceStateAvailable, -} - -func (r *MachineReconciler) updateNetworkInterfaceStatusFromIRIStatus( - ctx context.Context, - nic *networkingv1alpha1.NetworkInterface, - iriNicStatus *iri.NetworkInterfaceStatus, -) error { - if iriNicStatus == nil { - return nil // nothing to do - } - - nicState, ok := iriNetworkInterfaceStateToNetworkInterfaceState[iriNicStatus.State] - if !ok { - return fmt.Errorf("encountered unknown network interface state %s", iriNicStatus.State) - } - - nicBase := nic.DeepCopy() - if nicBase.Status.State != nicState || !slices.Equal(nic.Status.IPs, commonv1alpha1.MustParseIPs(iriNicStatus.Ips...)) { - nic.Status.LastStateTransitionTime = &metav1.Time{Time: time.Now()} - nic.Status.IPs = commonv1alpha1.MustParseIPs(iriNicStatus.Ips...) - nic.Status.State = nicState - - if err := r.Status().Patch(ctx, nic, client.MergeFrom(nicBase)); err != nil { - return fmt.Errorf("failed to patch network interface status: %w", err) - } - } - - return nil -} - func (r *MachineReconciler) updateMachineStatus(ctx context.Context, machine *computev1alpha1.Machine, iriMachine *iri.Machine) error { now := metav1.Now() diff --git a/poollet/machinepoollet/controllers/machine_controller_test.go b/poollet/machinepoollet/controllers/machine_controller_test.go index faa87cdaf..fd6c975e5 100644 --- a/poollet/machinepoollet/controllers/machine_controller_test.go +++ b/poollet/machinepoollet/controllers/machine_controller_test.go @@ -146,7 +146,6 @@ var _ = Describe("MachineController", func() { Name: "primary", Handle: "primary-handle", State: iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED, - Ips: []string{"10.0.0.11"}, }, } srv.SetMachines([]*testingmachine.FakeMachine{iriMachine}) @@ -295,27 +294,12 @@ var _ = Describe("MachineController", func() { Name: "primary", Handle: "primary-handle", State: iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED, - Ips: []string{"10.0.0.1"}, }, } srv.SetMachines([]*testingmachine.FakeMachine{iriMachine}) - Eventually(Object(nic)).Should(And( - HaveField("Spec.ProviderID", Equal("primary-handle")), - HaveField("Status", MatchFields(IgnoreExtras, Fields{ - "State": Equal(networkingv1alpha1.NetworkInterfaceStateAvailable), - "IPs": ContainElement(commonv1alpha1.MustParseIP("10.0.0.1")), - })), - )) - - Consistently(Object(nic)).Should( - HaveField("Status", MatchFields(IgnoreExtras, Fields{ - "State": Equal(networkingv1alpha1.NetworkInterfaceStateAvailable), - "IPs": ContainElement(commonv1alpha1.MustParseIP("10.0.0.1")), - })), - ) - - By("ensuring the ironcore machine status networkInterfaces to have correct NetworkInterfaceRef") + By("waiting for the ironcore network interface to have a provider id set") + Eventually(Object(nic)).Should(HaveField("Spec.ProviderID", "primary-handle")) Eventually(Object(machine)).Should(HaveField("Status.NetworkInterfaces", ConsistOf(MatchFields(IgnoreExtras, Fields{ "Name": Equal("primary"), "Handle": Equal("primary-handle"),