From 297a7e90397895dba8a0497d4840079af8e864e9 Mon Sep 17 00:00:00 2001 From: Jana Radhakrishnan Date: Mon, 13 Jun 2016 14:11:18 -0700 Subject: [PATCH] Change port names in agent proto Signed-off-by: Jana Radhakrishnan --- libnetwork/agent.pb.go | 92 ++++++++++++++++++------------------- libnetwork/agent.proto | 6 +-- libnetwork/service_linux.go | 14 +++--- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/libnetwork/agent.pb.go b/libnetwork/agent.pb.go index 75127305b8..19b30422ad 100644 --- a/libnetwork/agent.pb.go +++ b/libnetwork/agent.pb.go @@ -98,13 +98,13 @@ type PortConfig struct { // Protocol for the port which is exposed. Protocol PortConfig_Protocol `protobuf:"varint,2,opt,name=protocol,proto3,enum=libnetwork.PortConfig_Protocol" json:"protocol,omitempty"` // The port which the application is exposing and is bound to. - Port uint32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"` - // NodePort specifies the port on which the service is + TargetPort uint32 `protobuf:"varint,3,opt,name=target_port,json=targetPort,proto3" json:"target_port,omitempty"` + // PublishedPort specifies the port on which the service is // exposed on all nodes on the cluster. If not specified an // arbitrary port in the node port range is allocated by the // system. If specified it should be within the node port // range and it should be available. - NodePort uint32 `protobuf:"varint,4,opt,name=node_port,json=nodePort,proto3" json:"node_port,omitempty"` + PublishedPort uint32 `protobuf:"varint,4,opt,name=published_port,json=publishedPort,proto3" json:"published_port,omitempty"` } func (m *PortConfig) Reset() { *m = PortConfig{} } @@ -141,8 +141,8 @@ func (this *PortConfig) GoString() string { s = append(s, "&libnetwork.PortConfig{") s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n") s = append(s, "Protocol: "+fmt.Sprintf("%#v", this.Protocol)+",\n") - s = append(s, "Port: "+fmt.Sprintf("%#v", this.Port)+",\n") - s = append(s, "NodePort: "+fmt.Sprintf("%#v", this.NodePort)+",\n") + s = append(s, "TargetPort: "+fmt.Sprintf("%#v", this.TargetPort)+",\n") + s = append(s, "PublishedPort: "+fmt.Sprintf("%#v", this.PublishedPort)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -257,15 +257,15 @@ func (m *PortConfig) MarshalTo(data []byte) (int, error) { i++ i = encodeVarintAgent(data, i, uint64(m.Protocol)) } - if m.Port != 0 { + if m.TargetPort != 0 { data[i] = 0x18 i++ - i = encodeVarintAgent(data, i, uint64(m.Port)) + i = encodeVarintAgent(data, i, uint64(m.TargetPort)) } - if m.NodePort != 0 { + if m.PublishedPort != 0 { data[i] = 0x20 i++ - i = encodeVarintAgent(data, i, uint64(m.NodePort)) + i = encodeVarintAgent(data, i, uint64(m.PublishedPort)) } return i, nil } @@ -339,11 +339,11 @@ func (m *PortConfig) Size() (n int) { if m.Protocol != 0 { n += 1 + sovAgent(uint64(m.Protocol)) } - if m.Port != 0 { - n += 1 + sovAgent(uint64(m.Port)) + if m.TargetPort != 0 { + n += 1 + sovAgent(uint64(m.TargetPort)) } - if m.NodePort != 0 { - n += 1 + sovAgent(uint64(m.NodePort)) + if m.PublishedPort != 0 { + n += 1 + sovAgent(uint64(m.PublishedPort)) } return n } @@ -383,8 +383,8 @@ func (this *PortConfig) String() string { s := strings.Join([]string{`&PortConfig{`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Protocol:` + fmt.Sprintf("%v", this.Protocol) + `,`, - `Port:` + fmt.Sprintf("%v", this.Port) + `,`, - `NodePort:` + fmt.Sprintf("%v", this.NodePort) + `,`, + `TargetPort:` + fmt.Sprintf("%v", this.TargetPort) + `,`, + `PublishedPort:` + fmt.Sprintf("%v", this.PublishedPort) + `,`, `}`, }, "") return s @@ -702,9 +702,9 @@ func (m *PortConfig) Unmarshal(data []byte) error { } case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Port", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TargetPort", wireType) } - m.Port = 0 + m.TargetPort = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowAgent @@ -714,16 +714,16 @@ func (m *PortConfig) Unmarshal(data []byte) error { } b := data[iNdEx] iNdEx++ - m.Port |= (uint32(b) & 0x7F) << shift + m.TargetPort |= (uint32(b) & 0x7F) << shift if b < 0x80 { break } } case 4: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field NodePort", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PublishedPort", wireType) } - m.NodePort = 0 + m.PublishedPort = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowAgent @@ -733,7 +733,7 @@ func (m *PortConfig) Unmarshal(data []byte) error { } b := data[iNdEx] iNdEx++ - m.NodePort |= (uint32(b) & 0x7F) << shift + m.PublishedPort |= (uint32(b) & 0x7F) << shift if b < 0x80 { break } @@ -865,29 +865,29 @@ var ( ) var fileDescriptorAgent = []byte{ - // 370 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0xbf, 0x4e, 0x32, 0x41, - 0x14, 0xc5, 0x59, 0xe0, 0x23, 0xec, 0x5d, 0x96, 0x8f, 0x4c, 0x8c, 0xd9, 0x60, 0xb2, 0x20, 0x15, - 0x85, 0x59, 0x12, 0x2c, 0xe9, 0x00, 0x8b, 0x6d, 0xcc, 0x66, 0xfc, 0xd3, 0x12, 0x60, 0xc7, 0xcd, - 0x44, 0x9c, 0xd9, 0xcc, 0xae, 0xd8, 0x5a, 0x1a, 0x3b, 0x1f, 0xc0, 0xca, 0x97, 0xb1, 0xb4, 0xb0, - 0xb0, 0x32, 0xc2, 0x13, 0xf8, 0x08, 0xce, 0x0c, 0xbb, 0x12, 0x13, 0x8a, 0x9b, 0xdc, 0x9c, 0xf3, - 0xbb, 0x37, 0x27, 0x07, 0xac, 0x69, 0x44, 0x58, 0xea, 0xc5, 0x82, 0xa7, 0x1c, 0xc1, 0x82, 0xce, - 0x18, 0x49, 0xef, 0xb8, 0xb8, 0x6e, 0xee, 0x45, 0x3c, 0xe2, 0x5a, 0xee, 0xa9, 0x6d, 0x43, 0x74, - 0x9e, 0x8a, 0x50, 0x3f, 0x61, 0x61, 0xcc, 0x29, 0x4b, 0x31, 0x99, 0x73, 0x11, 0x22, 0x04, 0x65, - 0x36, 0xbd, 0x21, 0x8e, 0xd1, 0x36, 0xba, 0x26, 0xd6, 0x3b, 0x3a, 0x84, 0x5a, 0x42, 0xc4, 0x92, - 0xce, 0xc9, 0x44, 0x7b, 0x45, 0xed, 0x59, 0x99, 0x76, 0xaa, 0x90, 0x23, 0x80, 0x1c, 0xa1, 0xa1, - 0x53, 0x52, 0xc0, 0xd0, 0x5e, 0x7f, 0xb6, 0xcc, 0xb3, 0x8d, 0xea, 0x8f, 0xb1, 0x99, 0x01, 0x7e, - 0xa8, 0xe8, 0x25, 0x15, 0xe9, 0xed, 0x74, 0x31, 0xa1, 0xb1, 0x53, 0xde, 0xd2, 0x97, 0x1b, 0xd5, - 0x0f, 0xb0, 0x99, 0x01, 0x7e, 0x8c, 0x7a, 0x60, 0x91, 0x2c, 0xa4, 0xc2, 0xff, 0x69, 0xbc, 0x2e, - 0x71, 0xc8, 0xb3, 0x4b, 0x1e, 0x72, 0x44, 0x1e, 0x0c, 0xc0, 0xa6, 0x2c, 0x12, 0x24, 0x49, 0x26, - 0x31, 0x17, 0x69, 0xe2, 0x54, 0xda, 0xa5, 0xae, 0xd5, 0xdf, 0xf7, 0xb6, 0x85, 0x78, 0x81, 0x34, - 0x46, 0x9c, 0x5d, 0xd1, 0x08, 0xd7, 0x32, 0x58, 0x49, 0x49, 0xe7, 0xdd, 0x00, 0xd8, 0x9a, 0x3b, - 0xfb, 0x18, 0x40, 0x55, 0xf7, 0x37, 0xe7, 0x0b, 0xdd, 0x45, 0xbd, 0xdf, 0xda, 0xfd, 0xda, 0x0b, - 0x32, 0x0c, 0xff, 0x1e, 0xa8, 0x87, 0x2a, 0x94, 0xee, 0xc8, 0xc6, 0x7a, 0x47, 0x07, 0x60, 0x32, - 0x1e, 0x12, 0x9d, 0x56, 0xd7, 0x61, 0xe3, 0xaa, 0x12, 0xd4, 0xa7, 0xce, 0x18, 0xaa, 0xf9, 0x1b, - 0xe4, 0x40, 0xe9, 0x7c, 0x14, 0x34, 0x0a, 0xcd, 0xff, 0x8f, 0xcf, 0x6d, 0x2b, 0x97, 0xa5, 0xa4, - 0x9c, 0x8b, 0x71, 0xd0, 0x30, 0xfe, 0x3a, 0x52, 0x6a, 0x96, 0x1f, 0x5e, 0xdc, 0xc2, 0xd0, 0xf9, - 0x58, 0xb9, 0x85, 0xef, 0x95, 0x6b, 0xdc, 0xaf, 0x5d, 0xe3, 0x55, 0xce, 0x9b, 0x9c, 0x2f, 0x39, - 0xb3, 0x8a, 0x8e, 0x76, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xca, 0xbb, 0xca, 0xdf, 0x3c, 0x02, - 0x00, 0x00, + // 384 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0x3f, 0x6f, 0xda, 0x40, + 0x18, 0xc6, 0x31, 0xb8, 0x08, 0xbf, 0xc6, 0x2e, 0x3a, 0x55, 0x95, 0xc5, 0x60, 0x28, 0x52, 0x25, + 0x86, 0xca, 0x48, 0x74, 0x64, 0x03, 0x3a, 0x78, 0xa9, 0x2c, 0xf7, 0xcf, 0x8a, 0x0c, 0xbe, 0xba, + 0xa7, 0xba, 0x3e, 0xeb, 0x7c, 0xd0, 0xb5, 0x63, 0x94, 0x2d, 0x1f, 0x20, 0x53, 0xbe, 0x4c, 0xc6, + 0x8c, 0x99, 0xa2, 0xc0, 0x9a, 0x25, 0x1f, 0x21, 0x77, 0x67, 0x1b, 0x14, 0x89, 0xe1, 0x95, 0x4e, + 0xbf, 0xe7, 0xf7, 0x9e, 0x5e, 0x3d, 0x60, 0x46, 0x09, 0xce, 0xb8, 0x97, 0x33, 0xca, 0x29, 0x82, + 0x94, 0xac, 0x33, 0xcc, 0xff, 0x51, 0xf6, 0xa7, 0xff, 0x2e, 0xa1, 0x09, 0x55, 0x78, 0x22, 0x5f, + 0xa5, 0x31, 0xba, 0x6a, 0x82, 0xfd, 0x25, 0x8b, 0x73, 0x4a, 0x32, 0x1e, 0xe2, 0x0d, 0x65, 0x31, + 0x42, 0xa0, 0x67, 0xd1, 0x5f, 0xec, 0x68, 0x43, 0x6d, 0x6c, 0x84, 0xea, 0x8d, 0x3e, 0x40, 0xb7, + 0xc0, 0x6c, 0x47, 0x36, 0x78, 0xa5, 0xb2, 0xa6, 0xca, 0xcc, 0x8a, 0x7d, 0x95, 0xca, 0x27, 0x80, + 0x5a, 0x21, 0xb1, 0xd3, 0x92, 0xc2, 0xdc, 0x3a, 0x3c, 0x0c, 0x8c, 0x6f, 0x25, 0xf5, 0x97, 0xa1, + 0x51, 0x09, 0x7e, 0x2c, 0xed, 0x1d, 0x61, 0x7c, 0x1b, 0xa5, 0x2b, 0x92, 0x3b, 0xfa, 0xc9, 0xfe, + 0x59, 0x52, 0x3f, 0x08, 0x8d, 0x4a, 0xf0, 0x73, 0x34, 0x01, 0x13, 0x57, 0x47, 0x4a, 0xfd, 0x8d, + 0xd2, 0x6d, 0xa1, 0x43, 0x7d, 0xbb, 0xf0, 0xa1, 0x56, 0xc4, 0xc2, 0x0c, 0x2c, 0x92, 0x25, 0x0c, + 0x17, 0xc5, 0x2a, 0xa7, 0x8c, 0x17, 0x4e, 0x7b, 0xd8, 0x1a, 0x9b, 0xd3, 0xf7, 0xde, 0xa9, 0x10, + 0x2f, 0x10, 0xc1, 0x82, 0x66, 0xbf, 0x48, 0x12, 0x76, 0x2b, 0x59, 0xa2, 0x62, 0xf4, 0xa4, 0x01, + 0x9c, 0xc2, 0xb3, 0x7d, 0xcc, 0xa0, 0xa3, 0xfa, 0xdb, 0xd0, 0x54, 0x75, 0x61, 0x4f, 0x07, 0xe7, + 0xbf, 0xf6, 0x82, 0x4a, 0x0b, 0x8f, 0x0b, 0x68, 0x00, 0x26, 0x8f, 0x58, 0x82, 0xb9, 0xba, 0x4d, + 0x55, 0x65, 0x85, 0x50, 0x22, 0xb9, 0x89, 0x3e, 0x82, 0x9d, 0x6f, 0xd7, 0x29, 0x29, 0x7e, 0xe3, + 0xb8, 0x74, 0x74, 0xe5, 0x58, 0x47, 0x2a, 0xb5, 0xd1, 0x12, 0x3a, 0xf5, 0xef, 0xc8, 0x81, 0xd6, + 0xf7, 0x45, 0xd0, 0x6b, 0xf4, 0xdf, 0x5e, 0x5e, 0x0f, 0xcd, 0x1a, 0x0b, 0x24, 0x93, 0x1f, 0xcb, + 0xa0, 0xa7, 0xbd, 0x4e, 0x04, 0xea, 0xeb, 0x17, 0x37, 0x6e, 0x63, 0xee, 0xdc, 0xef, 0xdd, 0xc6, + 0xf3, 0xde, 0xd5, 0xfe, 0x1f, 0x5c, 0xed, 0x56, 0xcc, 0x9d, 0x98, 0x47, 0x31, 0xeb, 0xb6, 0xba, + 0xf8, 0xf3, 0x4b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x6d, 0x44, 0x68, 0x53, 0x02, 0x00, 0x00, } diff --git a/libnetwork/agent.proto b/libnetwork/agent.proto index 9cd1559322..5d2b096755 100644 --- a/libnetwork/agent.proto +++ b/libnetwork/agent.proto @@ -55,12 +55,12 @@ message PortConfig { Protocol protocol = 2; // The port which the application is exposing and is bound to. - uint32 port = 3; + uint32 target_port = 3; - // NodePort specifies the port on which the service is + // PublishedPort specifies the port on which the service is // exposed on all nodes on the cluster. If not specified an // arbitrary port in the node port range is allocated by the // system. If specified it should be within the node port // range and it should be available. - uint32 node_port = 4; + uint32 published_port = 4; } diff --git a/libnetwork/service_linux.go b/libnetwork/service_linux.go index df6a35953b..204c59d9ff 100644 --- a/libnetwork/service_linux.go +++ b/libnetwork/service_linux.go @@ -440,14 +440,14 @@ func programIngress(gwIP net.IP, ingressPorts []*PortConfig, isDelete bool) erro for _, iPort := range ingressPorts { if iptables.ExistChain(ingressChain, iptables.Nat) { rule := strings.Fields(fmt.Sprintf("-t nat %s %s -p %s --dport %d -j DNAT --to-destination %s:%d", - addDelOpt, ingressChain, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)]), iPort.NodePort, gwIP, iPort.NodePort)) + addDelOpt, ingressChain, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)]), iPort.PublishedPort, gwIP, iPort.PublishedPort)) if err := iptables.RawCombinedOutput(rule...); err != nil { return fmt.Errorf("setting up rule failed, %v: %v", rule, err) } } if err := plumbProxy(iPort, isDelete); err != nil { - return fmt.Errorf("failed to create proxy for port %d: %v", iPort.NodePort, err) + return fmt.Errorf("failed to create proxy for port %d: %v", iPort.PublishedPort, err) } } @@ -482,7 +482,7 @@ func plumbProxy(iPort *PortConfig, isDelete bool) error { l io.Closer ) - portSpec := fmt.Sprintf("%d/%s", iPort.NodePort, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)])) + portSpec := fmt.Sprintf("%d/%s", iPort.PublishedPort, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)])) if isDelete { ingressProxyMu.Lock() if listener, ok := ingressProxyTbl[portSpec]; ok { @@ -497,9 +497,9 @@ func plumbProxy(iPort *PortConfig, isDelete bool) error { switch iPort.Protocol { case ProtocolTCP: - l, err = net.ListenTCP("tcp", &net.TCPAddr{Port: int(iPort.NodePort)}) + l, err = net.ListenTCP("tcp", &net.TCPAddr{Port: int(iPort.PublishedPort)}) case ProtocolUDP: - l, err = net.ListenUDP("udp", &net.UDPAddr{Port: int(iPort.NodePort)}) + l, err = net.ListenUDP("udp", &net.UDPAddr{Port: int(iPort.PublishedPort)}) } if err != nil { @@ -600,11 +600,11 @@ func fwMarker() { rules := [][]string{} for _, iPort := range ingressPorts { rule := strings.Fields(fmt.Sprintf("-t nat %s PREROUTING -p %s --dport %d -j REDIRECT --to-port %d", - addDelOpt, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)]), iPort.NodePort, iPort.Port)) + addDelOpt, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)]), iPort.PublishedPort, iPort.TargetPort)) rules = append(rules, rule) rule = strings.Fields(fmt.Sprintf("-t mangle %s PREROUTING -p %s --dport %d -j MARK --set-mark %d", - addDelOpt, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)]), iPort.NodePort, fwMark)) + addDelOpt, strings.ToLower(PortConfig_Protocol_name[int32(iPort.Protocol)]), iPort.PublishedPort, fwMark)) rules = append(rules, rule) }