diff --git a/network/v1/generated.pb.go b/network/v1/generated.pb.go index 536264a62dc..33963930380 100644 --- a/network/v1/generated.pb.go +++ b/network/v1/generated.pb.go @@ -430,6 +430,21 @@ func (m *HostSubnet) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + if len(m.EgressCIDRs) > 0 { + for _, s := range m.EgressCIDRs { + dAtA[i] = 0x32 + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } return i, nil } @@ -701,6 +716,12 @@ func (m *HostSubnet) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } + if len(m.EgressCIDRs) > 0 { + for _, s := range m.EgressCIDRs { + l = len(s) + n += 1 + l + sovGenerated(uint64(l)) + } + } return n } @@ -863,6 +884,7 @@ func (this *HostSubnet) String() string { `HostIP:` + fmt.Sprintf("%v", this.HostIP) + `,`, `Subnet:` + fmt.Sprintf("%v", this.Subnet) + `,`, `EgressIPs:` + fmt.Sprintf("%v", this.EgressIPs) + `,`, + `EgressCIDRs:` + fmt.Sprintf("%v", this.EgressCIDRs) + `,`, `}`, }, "") return s @@ -2030,6 +2052,35 @@ func (m *HostSubnet) Unmarshal(dAtA []byte) error { } m.EgressIPs = append(m.EgressIPs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EgressCIDRs", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + 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 ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EgressCIDRs = append(m.EgressCIDRs, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -2540,63 +2591,64 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 915 bytes of a gzipped FileDescriptorProto + // 935 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0x8f, 0xd3, 0xa4, 0xbb, 0x99, 0xb6, 0x69, 0x35, 0x8b, 0x58, 0xab, 0x48, 0x6e, 0xe4, 0x95, + 0x14, 0x8f, 0xd3, 0xa4, 0xbb, 0x99, 0xb4, 0x69, 0x35, 0x8b, 0x58, 0xab, 0x48, 0x4e, 0xe4, 0x95, 0x50, 0xd0, 0x0a, 0x9b, 0xb4, 0x08, 0xf5, 0x80, 0x40, 0xf2, 0xb6, 0xd2, 0x46, 0x5a, 0x42, 0x34, - 0xa9, 0xd0, 0x0a, 0x01, 0xc2, 0x75, 0xde, 0x3a, 0xa6, 0x89, 0x6d, 0x79, 0xc6, 0x41, 0x11, 0xe2, - 0xcf, 0x17, 0x40, 0xe2, 0xc3, 0xf0, 0x11, 0x38, 0xf4, 0xc0, 0x61, 0x0f, 0x08, 0xf6, 0x54, 0xd1, - 0x70, 0xe6, 0x0b, 0x70, 0x42, 0x33, 0x1e, 0x27, 0x76, 0xea, 0xa8, 0x51, 0x11, 0x39, 0x25, 0x9e, - 0xdf, 0x7b, 0xbf, 0xf7, 0xe7, 0xf7, 0xde, 0xd8, 0xe8, 0xc8, 0xf5, 0xd8, 0x20, 0x3e, 0x37, 0x9c, - 0x60, 0x64, 0x06, 0x21, 0xf8, 0x74, 0xe0, 0xbd, 0x60, 0xa6, 0x1d, 0x7a, 0xa6, 0x0f, 0xec, 0xeb, - 0x20, 0xba, 0x30, 0xc7, 0x2d, 0xd3, 0x05, 0x1f, 0x22, 0x9b, 0x41, 0xdf, 0x08, 0xa3, 0x80, 0x05, - 0xf8, 0xd1, 0xdc, 0xc9, 0x98, 0x39, 0x19, 0x76, 0xe8, 0x19, 0xd2, 0xc9, 0x18, 0xb7, 0xf6, 0xdf, - 0xce, 0x30, 0xbb, 0x81, 0x1b, 0x98, 0xc2, 0xf7, 0x3c, 0x7e, 0x21, 0x9e, 0xc4, 0x83, 0xf8, 0x97, - 0x70, 0xee, 0xbf, 0x7b, 0x71, 0x4c, 0x0d, 0x2f, 0xe0, 0xa1, 0x47, 0xb6, 0x33, 0xf0, 0x7c, 0x88, - 0x26, 0x66, 0x78, 0xe1, 0xf2, 0x03, 0x6a, 0x8e, 0x80, 0xd9, 0x05, 0x99, 0xec, 0xbf, 0xb7, 0xcc, - 0x2b, 0x8a, 0x7d, 0xe6, 0x8d, 0xc0, 0xa4, 0xce, 0x00, 0x46, 0xf6, 0x0d, 0xbf, 0xa3, 0x65, 0x7e, - 0x31, 0xf3, 0x86, 0xa6, 0xe7, 0x33, 0xca, 0xa2, 0x45, 0x27, 0xfd, 0xb7, 0x0d, 0x54, 0x7f, 0x32, - 0x8c, 0x29, 0x83, 0xa8, 0x93, 0xd4, 0x89, 0xbf, 0x44, 0xf7, 0x79, 0x6a, 0x7d, 0x9b, 0xd9, 0xaa, - 0xd2, 0x50, 0x9a, 0x5b, 0x87, 0xef, 0x18, 0x09, 0xb5, 0x91, 0xa5, 0x36, 0xc2, 0x0b, 0x97, 0x1f, - 0x50, 0x83, 0x5b, 0x1b, 0xe3, 0x96, 0xf1, 0xf1, 0xf9, 0x57, 0xe0, 0xb0, 0x8f, 0x80, 0xd9, 0x16, - 0xbe, 0xbc, 0x3a, 0x28, 0x4d, 0xaf, 0x0e, 0xd0, 0xfc, 0x8c, 0xcc, 0x58, 0xf1, 0x5b, 0xe8, 0x9e, - 0x6c, 0xaa, 0x5a, 0x6e, 0x28, 0xcd, 0x9a, 0xb5, 0x2b, 0xcd, 0xef, 0xc9, 0x1c, 0x48, 0x8a, 0xe3, - 0x13, 0xb4, 0x37, 0x08, 0x28, 0xa3, 0xf1, 0xb9, 0x0f, 0x6c, 0x08, 0xbe, 0xcb, 0x06, 0xea, 0x46, - 0x43, 0x69, 0xee, 0x58, 0xaa, 0xf4, 0xd9, 0x7b, 0x1a, 0x50, 0xd6, 0x13, 0xf8, 0x33, 0x81, 0x93, - 0x1b, 0x1e, 0xf8, 0x03, 0x54, 0xa7, 0x10, 0x8d, 0x3d, 0x07, 0x64, 0x00, 0xb5, 0x22, 0xe2, 0xbe, - 0x2e, 0x39, 0xea, 0xbd, 0x1c, 0x4a, 0x16, 0xac, 0xf1, 0x21, 0x42, 0xe1, 0x30, 0x76, 0x3d, 0xbf, - 0x63, 0x8f, 0x40, 0xad, 0x0a, 0xdf, 0x59, 0x89, 0xdd, 0x19, 0x42, 0x32, 0x56, 0xf8, 0x1b, 0xb4, - 0xeb, 0xe4, 0x1a, 0x4b, 0xd5, 0xcd, 0xc6, 0x46, 0x73, 0xeb, 0xf0, 0xd8, 0x58, 0x61, 0xd4, 0x8c, - 0xbc, 0x28, 0xa7, 0x3e, 0x8b, 0x26, 0xd6, 0x43, 0x19, 0x72, 0x37, 0x0f, 0x52, 0xb2, 0x18, 0x49, - 0xff, 0x16, 0x3d, 0x28, 0x20, 0xc0, 0x0d, 0x54, 0x71, 0xbc, 0x7e, 0x24, 0x64, 0xad, 0x59, 0xdb, - 0x92, 0xae, 0xf2, 0xa4, 0x7d, 0x42, 0x88, 0x40, 0xd2, 0x7e, 0x67, 0xfb, 0x29, 0x34, 0xba, 0xb5, - 0xdf, 0xd9, 0x13, 0xfd, 0x57, 0x05, 0xe1, 0x7c, 0xfc, 0x67, 0x1e, 0x65, 0xf8, 0xb3, 0x1b, 0x93, - 0x65, 0xac, 0x36, 0x59, 0xdc, 0x5b, 0xcc, 0xd5, 0x9e, 0x4c, 0xe2, 0x7e, 0x7a, 0x92, 0x99, 0xaa, - 0xe7, 0xa8, 0xea, 0x31, 0x18, 0x51, 0xb5, 0x2c, 0xda, 0x7c, 0x74, 0x87, 0x36, 0x5b, 0x3b, 0x92, - 0xbf, 0xda, 0xe6, 0x4c, 0x24, 0x21, 0xd4, 0xff, 0x50, 0xd0, 0x83, 0x53, 0x37, 0x02, 0x4a, 0xa5, - 0x5d, 0x37, 0x18, 0x7a, 0xce, 0x64, 0x0d, 0x9b, 0xf2, 0x05, 0xaa, 0xd0, 0x10, 0x1c, 0x21, 0xc1, - 0xd6, 0xe1, 0xfb, 0x2b, 0x95, 0x54, 0x90, 0x69, 0x2f, 0x04, 0x67, 0x2e, 0x37, 0x7f, 0x22, 0x82, - 0x57, 0xff, 0x5d, 0x41, 0x0f, 0x0b, 0xec, 0xd7, 0xa0, 0xd6, 0xe7, 0x79, 0xb5, 0x8e, 0xef, 0x5a, - 0xda, 0x12, 0xc9, 0xbe, 0x2b, 0xac, 0xab, 0x0b, 0x10, 0xe1, 0x63, 0xb4, 0xcd, 0x47, 0xbd, 0x07, - 0x43, 0x70, 0x58, 0x90, 0x2e, 0xc3, 0x6b, 0x92, 0x66, 0x9b, 0x2f, 0x43, 0x8a, 0x91, 0x9c, 0x25, - 0xbf, 0xb7, 0xfa, 0x3e, 0x15, 0x77, 0xc0, 0xc2, 0xbd, 0x75, 0xd2, 0xe9, 0x89, 0x0b, 0x20, 0xc5, - 0xf5, 0x9f, 0x8b, 0x1b, 0x4b, 0xe2, 0x21, 0xe0, 0x0f, 0x51, 0x85, 0x4d, 0x42, 0x90, 0x81, 0x1f, - 0xa7, 0xb2, 0x9c, 0x4d, 0x42, 0xf8, 0xe7, 0xea, 0xe0, 0x8d, 0x25, 0x6e, 0x1c, 0x26, 0xc2, 0x11, - 0x3f, 0x47, 0x65, 0x16, 0xfc, 0xd7, 0x99, 0xe0, 0xbd, 0xb0, 0x90, 0x0c, 0x5e, 0x3e, 0x0b, 0x48, - 0x99, 0x05, 0xfa, 0xf7, 0x85, 0x59, 0xf3, 0x81, 0xc1, 0x7d, 0xb4, 0x09, 0x02, 0x52, 0x15, 0xa1, - 0xd8, 0x9d, 0x03, 0xf3, 0x62, 0xac, 0xba, 0x0c, 0xbc, 0x99, 0x18, 0x10, 0xc9, 0xad, 0xff, 0x58, - 0x46, 0x68, 0x7e, 0xc1, 0xac, 0x61, 0xc3, 0x1a, 0xa8, 0xc2, 0xaf, 0x2f, 0x29, 0xe8, 0x6c, 0x47, - 0x78, 0x0e, 0x44, 0x20, 0xf8, 0x4d, 0xb4, 0xc9, 0x7f, 0xdb, 0x5d, 0xf1, 0xe2, 0xa9, 0xcd, 0x53, - 0x7f, 0x2a, 0x4e, 0x89, 0x44, 0xb9, 0x5d, 0xf2, 0xd2, 0x91, 0x2f, 0x97, 0x99, 0x5d, 0x52, 0x0b, - 0x91, 0x28, 0x7e, 0x8c, 0x6a, 0x49, 0xb1, 0xed, 0x2e, 0x55, 0xab, 0x8d, 0x8d, 0x66, 0xcd, 0xda, - 0x99, 0x5e, 0x1d, 0xd4, 0x4e, 0xd3, 0x43, 0x32, 0xc7, 0xf5, 0x5f, 0x14, 0x54, 0xcf, 0x5c, 0xb8, - 0xff, 0xff, 0x5e, 0x9e, 0xe5, 0xf7, 0xd2, 0x5c, 0x49, 0xe5, 0x79, 0x86, 0x4b, 0xd6, 0xf1, 0x6f, - 0x05, 0x6d, 0x77, 0x80, 0xf1, 0xd5, 0xa0, 0xa1, 0xed, 0xc0, 0xda, 0x3e, 0x32, 0xfc, 0x82, 0x65, - 0x95, 0x89, 0x90, 0x14, 0xc7, 0x8f, 0x50, 0xd5, 0x07, 0xe6, 0xf5, 0xe5, 0x97, 0xc5, 0xac, 0x84, - 0x0e, 0xb0, 0xf6, 0x09, 0x49, 0xb0, 0xbc, 0x6c, 0x95, 0x5b, 0x64, 0xbb, 0x54, 0xd0, 0x5e, 0xb6, - 0xde, 0x35, 0x08, 0xf7, 0x49, 0x5e, 0xb8, 0xd6, 0x4a, 0xc2, 0x65, 0x73, 0x2c, 0x96, 0xce, 0x6a, - 0x5e, 0x5e, 0x6b, 0xa5, 0x97, 0xd7, 0x5a, 0xe9, 0xd5, 0xb5, 0x56, 0xfa, 0x61, 0xaa, 0x29, 0x97, - 0x53, 0x4d, 0x79, 0x39, 0xd5, 0x94, 0x57, 0x53, 0x4d, 0xf9, 0x73, 0xaa, 0x29, 0x3f, 0xfd, 0xa5, - 0x95, 0x3e, 0x2d, 0x8f, 0x5b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x65, 0xc8, 0xb6, 0x0f, 0x78, - 0x0b, 0x00, 0x00, + 0xa9, 0xd0, 0x0a, 0x01, 0xc2, 0x75, 0xde, 0x3a, 0xa6, 0x89, 0x6d, 0x79, 0x26, 0x41, 0x11, 0xe2, + 0xcf, 0x47, 0xe0, 0xc3, 0xf0, 0x01, 0x38, 0x70, 0xe8, 0x81, 0xc3, 0x1e, 0x10, 0xf4, 0x14, 0xd1, + 0x70, 0xe6, 0x0b, 0x70, 0x42, 0x33, 0x1e, 0x27, 0x76, 0xeb, 0x40, 0x54, 0x44, 0x4e, 0xc9, 0xbc, + 0xdf, 0xfb, 0xff, 0x7b, 0x6f, 0xc6, 0xe8, 0xc8, 0xf5, 0xd8, 0x60, 0x7c, 0x6e, 0x38, 0xc1, 0xc8, + 0x0c, 0x42, 0xf0, 0xe9, 0xc0, 0x7b, 0xc1, 0x4c, 0x3b, 0xf4, 0x4c, 0x1f, 0xd8, 0x97, 0x41, 0x74, + 0x61, 0x4e, 0x5a, 0xa6, 0x0b, 0x3e, 0x44, 0x36, 0x83, 0xbe, 0x11, 0x46, 0x01, 0x0b, 0xf0, 0xa3, + 0xa5, 0x91, 0xb1, 0x30, 0x32, 0xec, 0xd0, 0x33, 0xa4, 0x91, 0x31, 0x69, 0x1d, 0xbc, 0x99, 0xf2, + 0xec, 0x06, 0x6e, 0x60, 0x0a, 0xdb, 0xf3, 0xf1, 0x0b, 0x71, 0x12, 0x07, 0xf1, 0x2f, 0xf6, 0x79, + 0xf0, 0xf6, 0xc5, 0x31, 0x35, 0xbc, 0x80, 0x87, 0x1e, 0xd9, 0xce, 0xc0, 0xf3, 0x21, 0x9a, 0x9a, + 0xe1, 0x85, 0xcb, 0x05, 0xd4, 0x1c, 0x01, 0xb3, 0x73, 0x32, 0x39, 0x78, 0x67, 0x95, 0x55, 0x34, + 0xf6, 0x99, 0x37, 0x02, 0x93, 0x3a, 0x03, 0x18, 0xd9, 0xb7, 0xec, 0x8e, 0x56, 0xd9, 0x8d, 0x99, + 0x37, 0x34, 0x3d, 0x9f, 0x51, 0x16, 0xdd, 0x34, 0xd2, 0x7f, 0xd9, 0x42, 0xb5, 0x27, 0xc3, 0x31, + 0x65, 0x10, 0x75, 0xe2, 0x3a, 0xf1, 0xe7, 0xe8, 0x3e, 0x4f, 0xad, 0x6f, 0x33, 0x5b, 0x55, 0x1a, + 0x4a, 0xb3, 0x7a, 0xf8, 0x96, 0x11, 0xbb, 0x36, 0xd2, 0xae, 0x8d, 0xf0, 0xc2, 0xe5, 0x02, 0x6a, + 0x70, 0x6d, 0x63, 0xd2, 0x32, 0x3e, 0x3c, 0xff, 0x02, 0x1c, 0xf6, 0x01, 0x30, 0xdb, 0xc2, 0x97, + 0xb3, 0x7a, 0x61, 0x3e, 0xab, 0xa3, 0xa5, 0x8c, 0x2c, 0xbc, 0xe2, 0x37, 0xd0, 0x3d, 0xd9, 0x54, + 0xb5, 0xd8, 0x50, 0x9a, 0x15, 0x6b, 0x4f, 0xaa, 0xdf, 0x93, 0x39, 0x90, 0x04, 0xc7, 0x27, 0x68, + 0x7f, 0x10, 0x50, 0x46, 0xc7, 0xe7, 0x3e, 0xb0, 0x21, 0xf8, 0x2e, 0x1b, 0xa8, 0x5b, 0x0d, 0xa5, + 0xb9, 0x6b, 0xa9, 0xd2, 0x66, 0xff, 0x69, 0x40, 0x59, 0x4f, 0xe0, 0xcf, 0x04, 0x4e, 0x6e, 0x59, + 0xe0, 0xf7, 0x50, 0x8d, 0x42, 0x34, 0xf1, 0x1c, 0x90, 0x01, 0xd4, 0x92, 0x88, 0xfb, 0xaa, 0xf4, + 0x51, 0xeb, 0x65, 0x50, 0x72, 0x43, 0x1b, 0x1f, 0x22, 0x14, 0x0e, 0xc7, 0xae, 0xe7, 0x77, 0xec, + 0x11, 0xa8, 0x65, 0x61, 0xbb, 0x28, 0xb1, 0xbb, 0x40, 0x48, 0x4a, 0x0b, 0x7f, 0x85, 0xf6, 0x9c, + 0x4c, 0x63, 0xa9, 0xba, 0xdd, 0xd8, 0x6a, 0x56, 0x0f, 0x8f, 0x8d, 0x35, 0x46, 0xcd, 0xc8, 0x92, + 0x72, 0xea, 0xb3, 0x68, 0x6a, 0x3d, 0x94, 0x21, 0xf7, 0xb2, 0x20, 0x25, 0x37, 0x23, 0xe9, 0x5f, + 0xa3, 0x07, 0x39, 0x0e, 0x70, 0x03, 0x95, 0x1c, 0xaf, 0x1f, 0x09, 0x5a, 0x2b, 0xd6, 0x8e, 0x74, + 0x57, 0x7a, 0xd2, 0x3e, 0x21, 0x44, 0x20, 0x49, 0xbf, 0xd3, 0xfd, 0x14, 0x1c, 0xfd, 0x6b, 0xbf, + 0xd3, 0x12, 0xfd, 0x67, 0x05, 0xe1, 0x6c, 0xfc, 0x67, 0x1e, 0x65, 0xf8, 0x93, 0x5b, 0x93, 0x65, + 0xac, 0x37, 0x59, 0xdc, 0x5a, 0xcc, 0xd5, 0xbe, 0x4c, 0xe2, 0x7e, 0x22, 0x49, 0x4d, 0xd5, 0x73, + 0x54, 0xf6, 0x18, 0x8c, 0xa8, 0x5a, 0x14, 0x6d, 0x3e, 0xba, 0x43, 0x9b, 0xad, 0x5d, 0xe9, 0xbf, + 0xdc, 0xe6, 0x9e, 0x48, 0xec, 0x50, 0xff, 0x4d, 0x41, 0x0f, 0x4e, 0xdd, 0x08, 0x28, 0x95, 0x7a, + 0xdd, 0x60, 0xe8, 0x39, 0xd3, 0x0d, 0x6c, 0xca, 0x67, 0xa8, 0x44, 0x43, 0x70, 0x04, 0x05, 0xd5, + 0xc3, 0x77, 0xd7, 0x2a, 0x29, 0x27, 0xd3, 0x5e, 0x08, 0xce, 0x92, 0x6e, 0x7e, 0x22, 0xc2, 0xaf, + 0xfe, 0xab, 0x82, 0x1e, 0xe6, 0xe8, 0x6f, 0x80, 0xad, 0x4f, 0xb3, 0x6c, 0x1d, 0xdf, 0xb5, 0xb4, + 0x15, 0x94, 0x7d, 0x93, 0x5b, 0x57, 0x17, 0x20, 0xc2, 0xc7, 0x68, 0x87, 0x8f, 0x7a, 0x0f, 0x86, + 0xe0, 0xb0, 0x20, 0x59, 0x86, 0x57, 0xa4, 0x9b, 0x1d, 0xbe, 0x0c, 0x09, 0x46, 0x32, 0x9a, 0xfc, + 0xde, 0xea, 0xfb, 0x54, 0xdc, 0x01, 0x37, 0xee, 0xad, 0x93, 0x4e, 0x4f, 0x5c, 0x00, 0x09, 0xae, + 0xff, 0x90, 0xdf, 0x58, 0x32, 0x1e, 0x02, 0x7e, 0x1f, 0x95, 0xd8, 0x34, 0x04, 0x19, 0xf8, 0x71, + 0x42, 0xcb, 0xd9, 0x34, 0x84, 0xbf, 0x66, 0xf5, 0xd7, 0x56, 0x98, 0x71, 0x98, 0x08, 0x43, 0xfc, + 0x1c, 0x15, 0x59, 0xf0, 0x5f, 0x67, 0x82, 0xf7, 0xc2, 0x42, 0x32, 0x78, 0xf1, 0x2c, 0x20, 0x45, + 0x16, 0xe8, 0xdf, 0xe6, 0x66, 0xcd, 0x07, 0x06, 0xf7, 0xd1, 0x36, 0x08, 0x48, 0x55, 0x04, 0x63, + 0x77, 0x0e, 0xcc, 0x8b, 0xb1, 0x6a, 0x32, 0xf0, 0x76, 0xac, 0x40, 0xa4, 0x6f, 0xfd, 0xc7, 0x22, + 0x42, 0xcb, 0x0b, 0x66, 0x03, 0x1b, 0xd6, 0x40, 0x25, 0x7e, 0x7d, 0x49, 0x42, 0x17, 0x3b, 0xc2, + 0x73, 0x20, 0x02, 0xc1, 0xaf, 0xa3, 0x6d, 0xfe, 0xdb, 0xee, 0x8a, 0x87, 0xa7, 0xb2, 0x4c, 0xfd, + 0xa9, 0x90, 0x12, 0x89, 0x72, 0xbd, 0xf8, 0xd1, 0x91, 0x8f, 0xcb, 0x42, 0x2f, 0xae, 0x85, 0x48, + 0x14, 0x3f, 0x46, 0x95, 0xb8, 0xd8, 0x76, 0x97, 0xaa, 0xe5, 0xc6, 0x56, 0xb3, 0x62, 0xed, 0xce, + 0x67, 0xf5, 0xca, 0x69, 0x22, 0x24, 0x4b, 0x1c, 0xb7, 0x50, 0x35, 0x3e, 0xf0, 0xb1, 0x8c, 0x5f, + 0x90, 0x8a, 0xb5, 0x37, 0x9f, 0xd5, 0xab, 0xa7, 0x4b, 0x31, 0x49, 0xeb, 0xe8, 0x3f, 0x29, 0xa8, + 0x96, 0xba, 0xa3, 0xff, 0xff, 0x55, 0x3e, 0xcb, 0xae, 0xb2, 0xb9, 0xd6, 0x60, 0x2c, 0x33, 0x5c, + 0xb1, 0xc1, 0x7f, 0x2a, 0x68, 0xa7, 0x03, 0x8c, 0x6f, 0x13, 0x0d, 0x6d, 0x07, 0x36, 0xf6, 0x5d, + 0xe2, 0xe7, 0xec, 0xb7, 0x4c, 0x84, 0x24, 0x38, 0x7e, 0x84, 0xca, 0x3e, 0x30, 0xaf, 0x2f, 0x3f, + 0x46, 0x16, 0x25, 0x74, 0x80, 0xb5, 0x4f, 0x48, 0x8c, 0x65, 0x99, 0x2e, 0xfd, 0x33, 0xd3, 0xfa, + 0xa5, 0x82, 0xf6, 0xd3, 0xf5, 0x6e, 0x80, 0xb8, 0x8f, 0xb2, 0xc4, 0xb5, 0xd6, 0x22, 0x2e, 0x9d, + 0x63, 0x3e, 0x75, 0x56, 0xf3, 0xf2, 0x5a, 0x2b, 0xbc, 0xbc, 0xd6, 0x0a, 0x57, 0xd7, 0x5a, 0xe1, + 0xbb, 0xb9, 0xa6, 0x5c, 0xce, 0x35, 0xe5, 0xe5, 0x5c, 0x53, 0xae, 0xe6, 0x9a, 0xf2, 0xfb, 0x5c, + 0x53, 0xbe, 0xff, 0x43, 0x2b, 0x7c, 0x5c, 0x9c, 0xb4, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf6, + 0xe6, 0x53, 0x02, 0xab, 0x0b, 0x00, 0x00, } diff --git a/network/v1/generated.proto b/network/v1/generated.proto index e6f2ff51374..6bbc3ffacf7 100644 --- a/network/v1/generated.proto +++ b/network/v1/generated.proto @@ -114,9 +114,17 @@ message HostSubnet { // Subnet is the CIDR range of the overlay network assigned to the node for its pods optional string subnet = 4; - // EgressIPs is the list of automatic egress IP addresses currently hosted by this node + // EgressIPs is the list of automatic egress IP addresses currently hosted by this node. + // If EgressCIDRs is empty, this can be set by hand; if EgressCIDRs is set then the + // master will overwrite the value here with its own allocation of egress IPs. // +optional repeated string egressIPs = 5; + + // EgressCIDRs is the list of CIDR ranges available for automatically assigning + // egress IPs to this node from. If this field is set then EgressIPs should be + // treated as read-only. + // +optional + repeated string egressCIDRs = 6; } // HostSubnetList is a collection of HostSubnets diff --git a/network/v1/types.go b/network/v1/types.go index 9735d5068f5..bf436e45310 100644 --- a/network/v1/types.go +++ b/network/v1/types.go @@ -69,9 +69,16 @@ type HostSubnet struct { // Subnet is the CIDR range of the overlay network assigned to the node for its pods Subnet string `json:"subnet" protobuf:"bytes,4,opt,name=subnet"` - // EgressIPs is the list of automatic egress IP addresses currently hosted by this node + // EgressIPs is the list of automatic egress IP addresses currently hosted by this node. + // If EgressCIDRs is empty, this can be set by hand; if EgressCIDRs is set then the + // master will overwrite the value here with its own allocation of egress IPs. // +optional EgressIPs []string `json:"egressIPs,omitempty" protobuf:"bytes,5,rep,name=egressIPs"` + // EgressCIDRs is the list of CIDR ranges available for automatically assigning + // egress IPs to this node from. If this field is set then EgressIPs should be + // treated as read-only. + // +optional + EgressCIDRs []string `json:"egressCIDRs,omitempty" protobuf:"bytes,6,rep,name=egressCIDRs"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/network/v1/types_swagger_doc_generated.go b/network/v1/types_swagger_doc_generated.go index 86c4c6df761..fc2de92b0ec 100644 --- a/network/v1/types_swagger_doc_generated.go +++ b/network/v1/types_swagger_doc_generated.go @@ -95,12 +95,13 @@ func (EgressNetworkPolicySpec) SwaggerDoc() map[string]string { } var map_HostSubnet = map[string]string{ - "": "HostSubnet describes the container subnet network on a node. The HostSubnet object must have the same name as the Node object it corresponds to.", - "metadata": "Standard object's metadata.", - "host": "Host is the name of the node. (This is the same as the object's name, but both fields must be set.)", - "hostIP": "HostIP is the IP address to be used as a VTEP by other nodes in the overlay network", - "subnet": "Subnet is the CIDR range of the overlay network assigned to the node for its pods", - "egressIPs": "EgressIPs is the list of automatic egress IP addresses currently hosted by this node", + "": "HostSubnet describes the container subnet network on a node. The HostSubnet object must have the same name as the Node object it corresponds to.", + "metadata": "Standard object's metadata.", + "host": "Host is the name of the node. (This is the same as the object's name, but both fields must be set.)", + "hostIP": "HostIP is the IP address to be used as a VTEP by other nodes in the overlay network", + "subnet": "Subnet is the CIDR range of the overlay network assigned to the node for its pods", + "egressIPs": "EgressIPs is the list of automatic egress IP addresses currently hosted by this node. If EgressCIDRs is empty, this can be set by hand; if EgressCIDRs is set then the master will overwrite the value here with its own allocation of egress IPs.", + "egressCIDRs": "EgressCIDRs is the list of CIDR ranges available for automatically assigning egress IPs to this node from. If this field is set then EgressIPs should be treated as read-only.", } func (HostSubnet) SwaggerDoc() map[string]string { diff --git a/network/v1/zz_generated.deepcopy.go b/network/v1/zz_generated.deepcopy.go index c39237bd54f..8b7cc15a5b2 100644 --- a/network/v1/zz_generated.deepcopy.go +++ b/network/v1/zz_generated.deepcopy.go @@ -212,6 +212,11 @@ func (in *HostSubnet) DeepCopyInto(out *HostSubnet) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.EgressCIDRs != nil { + in, out := &in.EgressCIDRs, &out.EgressCIDRs + *out = make([]string, len(*in)) + copy(*out, *in) + } return }