stellarproject
/
heimdall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename gateway to endpoint 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2019-10-06 03:11:45 -04:00
parent 87adb7d366
commit bde4dba555
No known key found for this signature in database
GPG Key ID: A519480096146526
9 changed files with 100 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
api/v1/heimdall.pb.go
View File

@ -214,8 +214,9 @@ type Node struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Addr string `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
KeyPair *KeyPair `protobuf:"bytes,3,opt,name=keypair,proto3" json:"keypair,omitempty"`
GatewayIP string `protobuf:"bytes,4,opt,name=gateway_ip,json=gatewayIp,proto3" json:"gateway_ip,omitempty"`
GatewayPort uint64 `protobuf:"varint,5,opt,name=gateway_port,json=gatewayPort,proto3" json:"gateway_port,omitempty"`
EndpointIP string `protobuf:"bytes,4,opt,name=endpoint_ip,json=endpointIp,proto3" json:"endpoint_ip,omitempty"`
EndpointPort uint64 `protobuf:"varint,5,opt,name=endpoint_port,json=endpointPort,proto3" json:"endpoint_port,omitempty"`
GatewayIP string `protobuf:"bytes,6,opt,name=gateway_ip,json=gatewayIp,proto3" json:"gateway_ip,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -266,6 +267,20 @@ func (m *Node) GetKeyPair() *KeyPair {
return nil
}
func (m *Node) GetEndpointIP() string {
if m != nil {
return m.EndpointIP
}
return ""
}
func (m *Node) GetEndpointPort() uint64 {
if m != nil {
return m.EndpointPort
}
return 0
}
func (m *Node) GetGatewayIP() string {
if m != nil {
return m.GatewayIP
@ -273,13 +288,6 @@ func (m *Node) GetGatewayIP() string {
return ""
}
func (m *Node) GetGatewayPort() uint64 {
if m != nil {
return m.GatewayPort
}
return 0
}
type NodesRequest struct {
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
@ -699,56 +707,56 @@ func init() {
}
var fileDescriptor_b6184fc395da86b1 = []byte{
// 770 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5d, 0x6b, 0xe3, 0x46,
0x14, 0x45, 0xfe, 0x90, 0xed, 0x2b, 0xc7, 0x81, 0xa1, 0x04, 0xe1, 0x52, 0xe4, 0xa8, 0x0f, 0x75,
0x4a, 0x90, 0x62, 0x97, 0x42, 0xa1, 0x14, 0x1a, 0x27, 0x6d, 0x2a, 0xd2, 0x06, 0x77, 0xda, 0xbc,
0x94, 0x82, 0x91, 0xad, 0xa9, 0xa3, 0x44, 0xf6, 0x4c, 0x47, 0x63, 0x07, 0x3f, 0xf5, 0x9f, 0xf5,
0x67, 0xec, 0xa3, 0x1f, 0xfc, 0x47, 0x76, 0x99, 0xd1, 0xc8, 0x6b, 0x6f, 0xc8, 0xae, 0xc2, 0xee,
0x9b, 0xee, 0x99, 0x7b, 0xcf, 0x9c, 0x7b, 0xe6, 0x4b, 0xf0, 0xdd, 0x34, 0x16, 0x77, 0x8b, 0xb1,
0x37, 0xa1, 0x33, 0x3f, 0x15, 0x24, 0x49, 0x42, 0xce, 0x38, 0xbd, 0x27, 0x13, 0xe1, 0xdf, 0x91,
0x78, 0x16, 0x85, 0x49, 0xe2, 0x87, 0x2c, 0xf6, 0x97, 0xbd, 0x6d, 0xec, 0x31, 0x4e, 0x05, 0x45,
0xc7, 0x31, 0xf5, 0xf6, 0x2b, 0xbc, 0x6d, 0x46, 0xc8, 0x62, 0x6f, 0xd9, 0x6b, 0x7f, 0x36, 0xa5,
0x53, 0xaa, 0xb2, 0x7d, 0xf9, 0x95, 0x15, 0xb6, 0x3f, 0x9f, 0x52, 0x3a, 0x4d, 0x88, 0xaf, 0xa2,
0xf1, 0xe2, 0x1f, 0x9f, 0xcc, 0x98, 0x58, 0x65, 0x83, 0xee, 0x7f, 0x60, 0xfe, 0x16, 0xa6, 0x82,
0x70, 0x74, 0x04, 0xa5, 0x38, 0xb2, 0x8d, 0x8e, 0xd1, 0x6d, 0x0c, 0xcc, 0xcd, 0xda, 0x29, 0x05,
0x97, 0xb8, 0x14, 0x47, 0xa8, 0x0f, 0xcd, 0x29, 0x67, 0x93, 0x51, 0x18, 0x45, 0x9c, 0xa4, 0xa9,
0x5d, 0x52, 0x19, 0x87, 0x9b, 0xb5, 0x63, 0x5d, 0xe1, 0xe1, 0xc5, 0x79, 0x06, 0x63, 0x4b, 0x26,
0xe9, 0x00, 0x9d, 0x40, 0x83, 0x93, 0x28, 0x4e, 0x47, 0x0b, 0x9e, 0xd8, 0x65, 0x55, 0xd0, 0xdc,
0xac, 0x9d, 0x3a, 0x96, 0xe0, 0x2d, 0xfe, 0x15, 0xd7, 0xd5, 0xf0, 0x2d, 0x4f, 0xdc, 0x00, 0x5a,
0x17, 0x74, 0x3e, 0x27, 0x13, 0x81, 0xc9, 0xbf, 0x0b, 0x92, 0x8a, 0x67, 0x85, 0x38, 0x60, 0x4d,
0x92, 0x85, 0xd4, 0x3a, 0x7a, 0x20, 0xab, 0x4c, 0x07, 0x06, 0x0d, 0x5d, 0x93, 0x95, 0xfb, 0x27,
0x1c, 0x6e, 0xa9, 0x52, 0x46, 0xe7, 0x29, 0x41, 0xe7, 0x60, 0xce, 0x54, 0x7b, 0x8a, 0xcf, 0xea,
0x9f, 0x78, 0x1f, 0x74, 0xd1, 0xcb, 0xfc, 0xc0, 0xba, 0xd0, 0x0d, 0xa0, 0x76, 0x4d, 0x56, 0xc3,
0x30, 0xe6, 0x52, 0x01, 0xe3, 0xf1, 0x32, 0x14, 0x44, 0x29, 0x30, 0x32, 0x05, 0x1a, 0xba, 0x26,
0x2b, 0xf4, 0x05, 0x00, 0x5b, 0x8c, 0x93, 0x78, 0xb2, 0xa3, 0xb0, 0x91, 0x21, 0x52, 0xe0, 0x2b,
0x03, 0x2a, 0x37, 0x34, 0x22, 0xcf, 0xb6, 0x88, 0xa0, 0x22, 0x6d, 0xd6, 0x95, 0xea, 0x1b, 0xfd,
0x0e, 0xb5, 0x07, 0xb2, 0x62, 0x61, 0xcc, 0x95, 0x93, 0x56, 0xff, 0xeb, 0x02, 0x3d, 0x68, 0xc5,
0x03, 0x6b, 0xb3, 0x76, 0x72, 0xf9, 0x38, 0xe7, 0x41, 0xa7, 0x00, 0xd3, 0x50, 0x90, 0xc7, 0x70,
0x35, 0x8a, 0x99, 0x5d, 0x51, 0x32, 0x0e, 0x36, 0x6b, 0xa7, 0x71, 0x95, 0xa1, 0xc1, 0x10, 0x37,
0x74, 0x42, 0xc0, 0xd0, 0x31, 0x34, 0xf3, 0x6c, 0x46, 0xb9, 0xb0, 0xab, 0x1d, 0xa3, 0x5b, 0xc1,
0x96, 0xc6, 0x86, 0x94, 0x0b, 0xb7, 0x05, 0x4d, 0xd9, 0x57, 0xaa, 0x97, 0xd0, 0xbd, 0x81, 0x03,
0x1d, 0xeb, 0x75, 0xf8, 0x01, 0xaa, 0x73, 0x09, 0xd8, 0x46, 0xa7, 0xdc, 0xb5, 0xfa, 0x5f, 0x15,
0x68, 0x41, 0x12, 0xe0, 0xac, 0xca, 0xfd, 0xdf, 0x80, 0xca, 0x90, 0xbc, 0x67, 0x93, 0xee, 0x98,
0x54, 0xfa, 0x44, 0x26, 0xf9, 0x60, 0x85, 0x49, 0x42, 0x1f, 0x49, 0x34, 0x8a, 0x59, 0x6a, 0x97,
0x3b, 0xe5, 0x6e, 0x63, 0xd0, 0xda, 0xac, 0x1d, 0x38, 0xcf, 0xe0, 0x60, 0x98, 0x62, 0xd0, 0x29,
0x01, 0x4b, 0x51, 0x1b, 0xea, 0x64, 0x1e, 0x31, 0x1a, 0xcf, 0x45, 0xe6, 0x29, 0xde, 0xc6, 0xd2,
0x20, 0xa9, 0x7f, 0xd7, 0x20, 0x1d, 0xbf, 0x35, 0x88, 0x49, 0xe0, 0x05, 0x06, 0x49, 0x02, 0x9c,
0x55, 0xb9, 0x3f, 0x43, 0x15, 0xd3, 0x85, 0x20, 0xe8, 0x4b, 0xa8, 0x49, 0xcb, 0x46, 0x5b, 0x97,
0x60, 0xb3, 0x76, 0x4c, 0xe9, 0x65, 0x70, 0x89, 0x4d, 0x39, 0x14, 0x44, 0xc8, 0x86, 0xda, 0x9c,
0x88, 0x47, 0xca, 0x1f, 0xf4, 0x4e, 0xcb, 0x43, 0xf7, 0x0f, 0x40, 0x17, 0x9c, 0x84, 0x82, 0x28,
0xb6, 0xfc, 0x44, 0x7e, 0x24, 0xa9, 0x07, 0xe8, 0x92, 0x24, 0xe4, 0x1d, 0xd2, 0x9d, 0x7c, 0x63,
0x3f, 0xff, 0x10, 0x0e, 0x54, 0xe6, 0xd6, 0x2d, 0x0c, 0xad, 0x1c, 0xd0, 0x76, 0xfd, 0x08, 0x26,
0x57, 0x88, 0xf6, 0xab, 0x5b, 0xc0, 0xaf, 0x6c, 0x76, 0x5d, 0xd7, 0x7f, 0x5d, 0x81, 0xfa, 0x2f,
0x3a, 0x03, 0x31, 0xa8, 0xe9, 0x9b, 0x03, 0xf5, 0x0a, 0x30, 0xed, 0x5f, 0x58, 0xed, 0xfe, 0x4b,
0x4a, 0x74, 0x03, 0x33, 0x30, 0xb3, 0x96, 0xd0, 0x59, 0x51, 0xe9, 0xb9, 0x1d, 0xed, 0xde, 0x0b,
0x2a, 0xf4, 0x74, 0x7f, 0x83, 0xb5, 0xb3, 0xae, 0xe8, 0xdb, 0x22, 0x8a, 0x9f, 0xec, 0x83, 0xf6,
0x91, 0x97, 0x3d, 0x25, 0x5e, 0xfe, 0x94, 0x78, 0x3f, 0xc9, 0xa7, 0x44, 0xb2, 0xef, 0x2c, 0x70,
0x21, 0xf6, 0xa7, 0x1b, 0xe2, 0x59, 0xf6, 0x7b, 0xa8, 0xaa, 0xcb, 0x04, 0xf9, 0x05, 0x6f, 0x8d,
0xad, 0x51, 0x67, 0xc5, 0x0b, 0xb4, 0x4f, 0xf7, 0x50, 0x55, 0xe7, 0xb2, 0xd0, 0x5c, 0xbb, 0x27,
0xba, 0xd0, 0x5c, 0x7b, 0x47, 0x7e, 0xe0, 0xfd, 0x75, 0x5a, 0xf8, 0x67, 0xe0, 0xfb, 0x65, 0x6f,
0x6c, 0x2a, 0x5f, 0xbe, 0x79, 0x13, 0x00, 0x00, 0xff, 0xff, 0x30, 0x53, 0x36, 0x35, 0x43, 0x08,
0x00, 0x00,
// 784 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6a, 0xeb, 0x46,
0x18, 0xc5, 0x7f, 0xb2, 0xfd, 0xc9, 0x76, 0x60, 0x28, 0x41, 0xb8, 0x14, 0xb9, 0xca, 0xa2, 0x4e,
0x09, 0x52, 0xec, 0x52, 0x28, 0x94, 0x42, 0xf3, 0xd7, 0x54, 0xa4, 0x0d, 0xee, 0xb4, 0xd9, 0x94,
0x82, 0x91, 0xad, 0xa9, 0xa3, 0x44, 0xf6, 0x4c, 0x47, 0x63, 0x07, 0xaf, 0xba, 0xee, 0x4b, 0xf5,
0x51, 0xbc, 0xf0, 0x8b, 0xb4, 0xcc, 0x68, 0xa4, 0x6b, 0xdf, 0x90, 0x7b, 0x15, 0xee, 0xdd, 0xf9,
0x3b, 0xfa, 0xce, 0x99, 0x33, 0x67, 0xfe, 0x0c, 0xdf, 0xcc, 0x22, 0x71, 0xbf, 0x9c, 0xb8, 0x53,
0x3a, 0xf7, 0x12, 0x41, 0xe2, 0x38, 0xe0, 0x8c, 0xd3, 0x07, 0x32, 0x15, 0xde, 0x3d, 0x89, 0xe6,
0x61, 0x10, 0xc7, 0x5e, 0xc0, 0x22, 0x6f, 0x35, 0xc8, 0x6b, 0x97, 0x71, 0x2a, 0x28, 0xfa, 0x3c,
0xa2, 0xee, 0x3e, 0xc3, 0xcd, 0x3b, 0x02, 0x16, 0xb9, 0xab, 0x41, 0xf7, 0x93, 0x19, 0x9d, 0x51,
0xd5, 0xed, 0xc9, 0x5f, 0x29, 0xb1, 0xfb, 0xe9, 0x8c, 0xd2, 0x59, 0x4c, 0x3c, 0x55, 0x4d, 0x96,
0x7f, 0x7a, 0x64, 0xce, 0xc4, 0x3a, 0xfd, 0xe8, 0xfc, 0x0d, 0xc6, 0xcf, 0x41, 0x22, 0x08, 0x47,
0x87, 0x50, 0x8e, 0x42, 0xab, 0xd4, 0x2b, 0xf5, 0x9b, 0xe7, 0xc6, 0x76, 0x63, 0x97, 0xfd, 0x4b,
0x5c, 0x8e, 0x42, 0x34, 0x84, 0xd6, 0x8c, 0xb3, 0xe9, 0x38, 0x08, 0x43, 0x4e, 0x92, 0xc4, 0x2a,
0xab, 0x8e, 0x83, 0xed, 0xc6, 0x36, 0xaf, 0xf1, 0xe8, 0xe2, 0x2c, 0x85, 0xb1, 0x29, 0x9b, 0x74,
0x81, 0x8e, 0xa1, 0xc9, 0x49, 0x18, 0x25, 0xe3, 0x25, 0x8f, 0xad, 0x8a, 0x22, 0xb4, 0xb6, 0x1b,
0xbb, 0x81, 0x25, 0x78, 0x87, 0x7f, 0xc2, 0x0d, 0xf5, 0xf9, 0x8e, 0xc7, 0x8e, 0x0f, 0x9d, 0x0b,
0xba, 0x58, 0x90, 0xa9, 0xc0, 0xe4, 0xaf, 0x25, 0x49, 0xc4, 0x8b, 0x46, 0x6c, 0x30, 0xa7, 0xf1,
0x52, 0x7a, 0x1d, 0x3f, 0x92, 0x75, 0xea, 0x03, 0x83, 0x86, 0x6e, 0xc8, 0xda, 0xf9, 0x0d, 0x0e,
0x72, 0xa9, 0x84, 0xd1, 0x45, 0x42, 0xd0, 0x19, 0x18, 0x73, 0x35, 0x3d, 0xa5, 0x67, 0x0e, 0x8f,
0xdd, 0xf7, 0xa6, 0xe8, 0xa6, 0x79, 0x60, 0x4d, 0x74, 0x7c, 0xa8, 0xdf, 0x90, 0xf5, 0x28, 0x88,
0xb8, 0x74, 0xc0, 0x78, 0xb4, 0x0a, 0x04, 0x51, 0x0e, 0x4a, 0xa9, 0x03, 0x0d, 0xdd, 0x90, 0x35,
0xfa, 0x0c, 0x80, 0x2d, 0x27, 0x71, 0x34, 0xdd, 0x71, 0xd8, 0x4c, 0x11, 0x69, 0xf0, 0x9f, 0x32,
0x54, 0x6f, 0x69, 0x48, 0x5e, 0x9c, 0x22, 0x82, 0xaa, 0x8c, 0x59, 0x33, 0xd5, 0x6f, 0xf4, 0x0b,
0xd4, 0x1f, 0xc9, 0x9a, 0x05, 0x11, 0x57, 0x49, 0x9a, 0xc3, 0x2f, 0x0b, 0xcc, 0x41, 0x3b, 0x3e,
0x37, 0xb7, 0x1b, 0x3b, 0xb3, 0x8f, 0x33, 0x1d, 0xe4, 0x81, 0x49, 0x16, 0x21, 0xa3, 0xd1, 0x42,
0x8c, 0x23, 0x66, 0x55, 0x95, 0x8f, 0xce, 0x76, 0x63, 0xc3, 0x95, 0x86, 0xfd, 0x11, 0x86, 0xac,
0xc5, 0x67, 0xe8, 0x08, 0xda, 0x39, 0x81, 0x51, 0x2e, 0xac, 0x5a, 0xaf, 0xd4, 0xaf, 0xe2, 0x56,
0x06, 0x8e, 0x28, 0x17, 0xe8, 0x04, 0x60, 0x16, 0x08, 0xf2, 0x14, 0xac, 0xa5, 0xa8, 0xa1, 0x44,
0xdb, 0xdb, 0x8d, 0xdd, 0xbc, 0x4e, 0x51, 0x7f, 0x84, 0x9b, 0xba, 0xc1, 0x67, 0x4e, 0x07, 0x5a,
0x32, 0x8a, 0x44, 0xaf, 0xba, 0x73, 0x0b, 0x6d, 0x5d, 0xeb, 0xa5, 0xfb, 0x0e, 0x6a, 0x0b, 0x09,
0x58, 0xa5, 0x5e, 0xa5, 0x6f, 0x0e, 0xbf, 0x28, 0x30, 0x6b, 0x29, 0x80, 0x53, 0x96, 0xf3, 0x6f,
0x09, 0xaa, 0x23, 0xf2, 0x8e, 0x7d, 0xbd, 0x93, 0x6b, 0xf9, 0xe3, 0xe5, 0x1a, 0xc4, 0x31, 0x7d,
0x22, 0xe1, 0x38, 0x62, 0x89, 0x55, 0xe9, 0x55, 0xb2, 0x5c, 0xcf, 0x52, 0xd8, 0x1f, 0x25, 0x18,
0x74, 0x8b, 0xcf, 0x12, 0xd4, 0x85, 0x46, 0x16, 0x61, 0xba, 0x0a, 0x38, 0xaf, 0x65, 0x40, 0xd2,
0xff, 0x6e, 0x40, 0xba, 0x7e, 0x13, 0x10, 0x93, 0xc0, 0x2b, 0x02, 0x92, 0x02, 0x38, 0x65, 0x39,
0x3f, 0x40, 0x0d, 0xd3, 0xa5, 0x20, 0xe8, 0x08, 0xea, 0x32, 0xb2, 0x71, 0x9e, 0x12, 0x6c, 0x37,
0xb6, 0x21, 0xb3, 0xf4, 0x2f, 0xb1, 0x21, 0x3f, 0xf9, 0x21, 0xb2, 0xa0, 0xbe, 0x20, 0xe2, 0x89,
0xf2, 0x47, 0xbd, 0x39, 0xb3, 0xd2, 0xf9, 0x15, 0xd0, 0x05, 0x27, 0x81, 0x20, 0x4a, 0x2d, 0x3b,
0xc4, 0x1f, 0x28, 0xea, 0x02, 0xba, 0x24, 0x31, 0x79, 0x4b, 0x74, 0xa7, 0xbf, 0xb4, 0xdf, 0x7f,
0x00, 0x6d, 0xd5, 0x99, 0xa7, 0x85, 0xa1, 0x93, 0x01, 0x3a, 0xae, 0xef, 0xc1, 0xe0, 0x0a, 0xd1,
0x79, 0xf5, 0x0b, 0xe4, 0x95, 0x8e, 0xae, 0x79, 0xc3, 0xff, 0xaa, 0xd0, 0xf8, 0x51, 0x77, 0x20,
0x06, 0x75, 0x7d, 0xd9, 0xa0, 0x41, 0x01, 0xa5, 0xfd, 0x3b, 0xae, 0x3b, 0x7c, 0x0d, 0x45, 0x4f,
0x60, 0x0e, 0x46, 0x3a, 0x25, 0x74, 0x5a, 0xd4, 0x7a, 0x16, 0x47, 0x77, 0xf0, 0x0a, 0x86, 0x1e,
0xee, 0x0f, 0x30, 0x77, 0xd6, 0x15, 0x7d, 0x5d, 0xc4, 0xf1, 0xb3, 0x7d, 0xd0, 0x3d, 0x74, 0xd3,
0xd7, 0xc7, 0xcd, 0x5e, 0x1f, 0xf7, 0x4a, 0xbe, 0x3e, 0x52, 0x7d, 0x67, 0x81, 0x0b, 0xa9, 0x3f,
0xdf, 0x10, 0x2f, 0xaa, 0x3f, 0x40, 0x4d, 0x5d, 0x26, 0xc8, 0x2b, 0x78, 0x6b, 0xe4, 0x41, 0x9d,
0x16, 0x27, 0xe8, 0x9c, 0x1e, 0xa0, 0xa6, 0xce, 0x65, 0xa1, 0xb1, 0x76, 0x4f, 0x74, 0xa1, 0xb1,
0xf6, 0x8e, 0xfc, 0xb9, 0xfb, 0xfb, 0x49, 0xe1, 0xff, 0x0f, 0xdf, 0xae, 0x06, 0x13, 0x43, 0xe5,
0xf2, 0xd5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x77, 0xf6, 0x3d, 0x3c, 0x76, 0x08, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

5
api/v1/heimdall.proto
View File

@ -40,8 +40,9 @@ message Node {
string id = 1 [(gogoproto.customname) = "ID"];
string addr = 2;
KeyPair keypair = 3 [(gogoproto.customname) = "KeyPair"];
string gateway_ip = 4 [(gogoproto.customname) = "GatewayIP"];
uint64 gateway_port = 5;
string endpoint_ip = 4 [(gogoproto.customname) = "EndpointIP"];
uint64 endpoint_port = 5;
string gateway_ip = 6 [(gogoproto.customname) = "GatewayIP"];
}
message NodesRequest {}

2
client/client.go
View File

@ -44,7 +44,7 @@ type Client struct {
// NewClient returns a new Atlas client configured with the specified address and options
func NewClient(id, addr string, opts ...grpc.DialOption) (*Client, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
defer cancel()
if len(opts) == 0 {

6
cmd/hctl/nodes.go
View File

@ -53,10 +53,10 @@ var listNodesCommand = cli.Command{
}
w := tabwriter.NewWriter(os.Stdout, 20, 1, 3, ' ', 0)
fmt.Fprintf(w, "ID\tADDR\tGATEWAY\tPUBLIC KEY\n")
fmt.Fprintf(w, "ID\tADDR\tENDPOINT\tGATEWAY\tPUBLIC KEY\n")
for _, n := range nodes {
gw := fmt.Sprintf("%s:%d", n.GatewayIP, n.GatewayPort)
fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", n.ID, n.Addr, gw, n.KeyPair.PublicKey)
ep := fmt.Sprintf("%s:%d", n.EndpointIP, n.EndpointPort)
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", n.ID, n.Addr, ep, n.GatewayIP, n.KeyPair.PublicKey)
}
w.Flush()

8
cmd/heimdall/main.go
View File

@ -96,16 +96,16 @@ func main() {
EnvVar: "HEIMDALL_PEER_NETWORK",
},
cli.StringFlag{
Name: "gateway-ip",
Name: "endpoint-ip",
Usage: "IP used for peer communication",
Value: heimdall.GetIP(),
EnvVar: "HEIMDALL_GATEWAY_IP",
EnvVar: "HEIMDALL_ENDPOINT_IP",
},
cli.IntFlag{
Name: "gateway-port",
Name: "endpoint-port",
Usage: "port for peer communication",
Value: 10100,
EnvVar: "HEIMDALL_GATEWAY_PORT",
EnvVar: "HEIMDALL_ENDPOINT_PORT",
},
}
app.Before = func(c *cli.Context) error {

4
cmd/heimdall/run.go
View File

@ -47,8 +47,8 @@ func runServer(cx *cli.Context) error {
ClusterKey: cx.String("cluster-key"),
NodeNetwork: cx.String("node-network"),
PeerNetwork: cx.String("peer-network"),
GatewayIP: cx.String("gateway-ip"),
GatewayPort: cx.Int("gateway-port"),
EndpointIP: cx.String("endpoint-ip"),
EndpointPort: cx.Int("endpoint-port"),
RedisURL: cx.String("redis-url"),
AdvertiseRedisURL: cx.String("advertise-redis-url"),
}

6
config.go
View File

@ -35,10 +35,10 @@ type Config struct {
NodeNetwork string
// PeerNetwork is the subnet that is used for cluster peers
PeerNetwork string
// GatewayIP is the IP used for peer communication
GatewayIP string
// EndpointIP is the IP used for peer communication
EndpointIP string
// GatewayPort is the port used for peer communication
GatewayPort int
EndpointPort int
// RedisURL is the uri to the redis backend
RedisURL string
// AdvertiseRedisURL is the uri to the public redis backend

16
server/node.go
View File

@ -280,12 +280,18 @@ func (s *Server) nodeHeartbeat(ctx context.Context) {
logrus.Error(err)
continue
}
nodeIP, _, err := s.getNodeIP(ctx, s.cfg.ID)
if err != nil {
logrus.Error(err)
continue
}
node := &v1.Node{
ID: s.cfg.ID,
Addr: s.cfg.GRPCAddress,
KeyPair: keyPair,
GatewayIP: s.cfg.GatewayIP,
GatewayPort: uint64(s.cfg.GatewayPort),
ID: s.cfg.ID,
Addr: s.cfg.GRPCAddress,
KeyPair: keyPair,
EndpointIP: s.cfg.EndpointIP,
EndpointPort: uint64(s.cfg.EndpointPort),
GatewayIP: nodeIP.String(),
}
data, err := proto.Marshal(node)

13
server/peer.go
View File

@ -95,7 +95,7 @@ func (s *Server) updatePeerInfo(ctx context.Context) error {
return err
}
endpoint := fmt.Sprintf("%s:%d", s.cfg.GatewayIP, s.cfg.GatewayPort)
endpoint := fmt.Sprintf("%s:%d", s.cfg.EndpointIP, s.cfg.EndpointPort)
// build allowedIPs from routes and peer network
allowedIPs := []string{}
@ -104,8 +104,6 @@ func (s *Server) updatePeerInfo(ctx context.Context) error {
return err
}
logrus.Debugf("nodes: %+v", nodes)
for _, node := range nodes {
// only add the route if a peer to prevent route duplicate
if node.ID != s.cfg.ID {
@ -117,7 +115,6 @@ func (s *Server) updatePeerInfo(ctx context.Context) error {
return err
}
logrus.Debugf("peer network %s", gatewayNet)
allowedIPs = append(allowedIPs, gatewayNet.String())
}
@ -219,15 +216,17 @@ func (s *Server) updatePeerConfig(ctx context.Context) error {
return err
}
gatewayIP, _, err := s.getNodeIP(ctx, s.cfg.ID)
gatewayIP, gatewayNet, err := s.getNodeIP(ctx, s.cfg.ID)
if err != nil {
return err
}
size, _ := gatewayNet.Mask.Size()
wireguardCfg := &wireguardConfig{
Iface: defaultWireguardInterface,
PrivateKey: keyPair.PrivateKey,
ListenPort: s.cfg.GatewayPort,
Address: gatewayIP.To4().String() + "/32",
ListenPort: s.cfg.EndpointPort,
Address: fmt.Sprintf("%s/%d", gatewayIP.To4().String(), size),
Peers: peers,
}