diff --git a/pkg/apis/controlplane/types.go b/pkg/apis/controlplane/types.go index 63e9301ef27..5adfcb6b264 100644 --- a/pkg/apis/controlplane/types.go +++ b/pkg/apis/controlplane/types.go @@ -18,6 +18,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" + "net" + "strconv" crdv1alpha1 "antrea.io/antrea/pkg/apis/crd/v1alpha1" statsv1alpha1 "antrea.io/antrea/pkg/apis/stats/v1alpha1" @@ -81,11 +83,12 @@ type GroupMember struct { // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ClusterGroupMembers is a list of GroupMember objects that are currently selected by a ClusterGroup. +// ClusterGroupMembers is a list of GroupMember objects or ipBlocks that are currently selected by a ClusterGroup. type ClusterGroupMembers struct { metav1.TypeMeta metav1.ObjectMeta - EffectiveMembers []GroupMember + EffectiveMembers []GroupMember + EffectiveIPBlocks []IPNet } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -120,12 +123,20 @@ type AddressGroup struct { // IPAddress describes a single IP address. Either an IPv4 or IPv6 address must be set. type IPAddress []byte +func (ip IPAddress) String() string { + return net.IP(ip).String() +} + // IPNet describes an IP network. type IPNet struct { IP IPAddress PrefixLength int32 } +func (ipn IPNet) String() string { + return ipn.IP.String() + "/" + strconv.Itoa(int(ipn.PrefixLength)) +} + // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // AddressGroupPatch describes the incremental update of an AddressGroup. diff --git a/pkg/apis/controlplane/v1beta2/generated.pb.go b/pkg/apis/controlplane/v1beta2/generated.pb.go index ed77d617ad3..8550eb02291 100644 --- a/pkg/apis/controlplane/v1beta2/generated.pb.go +++ b/pkg/apis/controlplane/v1beta2/generated.pb.go @@ -896,122 +896,123 @@ func init() { } var fileDescriptor_fbaa7d016762fa1d = []byte{ - // 1826 bytes of a gzipped FileDescriptorProto + // 1850 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4d, 0x6c, 0x23, 0x49, - 0x15, 0x4e, 0xfb, 0x27, 0x89, 0x5f, 0x9c, 0xc4, 0xa9, 0xec, 0x30, 0x66, 0x19, 0xec, 0x6c, 0xf3, - 0xa3, 0x1c, 0xd8, 0xf6, 0x26, 0xcc, 0xee, 0x0e, 0xec, 0x0f, 0x8a, 0x77, 0xb2, 0x91, 0xa5, 0x59, - 0xaf, 0x55, 0xc9, 0x6a, 0x24, 0xc4, 0xc2, 0x76, 0xba, 0xcb, 0x4e, 0x11, 0xbb, 0xab, 0xd5, 0x5d, - 0x0e, 0x13, 0x71, 0x59, 0x04, 0x1c, 0x16, 0x90, 0xe0, 0xc6, 0x99, 0x13, 0x17, 0x6e, 0x48, 0xdc, - 0x39, 0x20, 0xcd, 0x71, 0x11, 0x42, 0xec, 0xc9, 0x62, 0x8c, 0x00, 0x71, 0xe0, 0xc6, 0x29, 0x5c, - 0x50, 0x55, 0x57, 0xff, 0x3a, 0x9e, 0x8c, 0x37, 0x99, 0x20, 0xc1, 0x9e, 0xec, 0x7e, 0xf5, 0xde, - 0xfb, 0xde, 0xab, 0xf7, 0x57, 0xd5, 0x0d, 0xaf, 0x9b, 0x0e, 0xf7, 0x88, 0x69, 0x50, 0xd6, 0x08, - 0xfe, 0x35, 0xdc, 0xe3, 0x5e, 0xc3, 0x74, 0xa9, 0xdf, 0xb0, 0x98, 0xc3, 0x3d, 0xd6, 0x77, 0xfb, - 0xa6, 0x43, 0x1a, 0x27, 0x5b, 0x87, 0x84, 0x9b, 0xdb, 0x8d, 0x1e, 0x71, 0x88, 0x67, 0x72, 0x62, - 0x1b, 0xae, 0xc7, 0x38, 0x43, 0x46, 0x20, 0xf5, 0x2d, 0xca, 0xd4, 0x3f, 0xc3, 0x3d, 0xee, 0x19, - 0x42, 0xde, 0x48, 0xca, 0x1b, 0x4a, 0xfe, 0xd9, 0x3b, 0xd3, 0xf1, 0x7c, 0x6e, 0x72, 0xbf, 0x71, - 0xb2, 0x65, 0xf6, 0xdd, 0x23, 0x73, 0x2b, 0x8b, 0xf4, 0xec, 0xf3, 0x3d, 0xca, 0x8f, 0x86, 0x87, - 0x86, 0xc5, 0x06, 0x8d, 0x1e, 0xeb, 0xb1, 0x86, 0x24, 0x1f, 0x0e, 0xbb, 0xf2, 0x49, 0x3e, 0xc8, - 0x7f, 0x8a, 0xfd, 0xf6, 0xf1, 0x1d, 0x5f, 0xa2, 0xb8, 0x74, 0x60, 0x5a, 0x47, 0xd4, 0x21, 0xde, - 0x69, 0x8c, 0x35, 0x20, 0xdc, 0x6c, 0x9c, 0x4c, 0x82, 0x34, 0xa6, 0x49, 0x79, 0x43, 0x87, 0xd3, - 0x01, 0x99, 0x10, 0x78, 0xe9, 0x22, 0x01, 0xdf, 0x3a, 0x22, 0x03, 0x73, 0x42, 0xee, 0xcb, 0xd3, - 0xe4, 0x86, 0x9c, 0xf6, 0x1b, 0xd4, 0xe1, 0x3e, 0xf7, 0xb2, 0x42, 0xfa, 0xdf, 0x35, 0x28, 0xef, - 0xd8, 0xb6, 0x47, 0x7c, 0x7f, 0xcf, 0x63, 0x43, 0x17, 0xbd, 0x07, 0x8b, 0xc2, 0x13, 0xdb, 0xe4, - 0x66, 0x55, 0xdb, 0xd0, 0x36, 0x97, 0xb6, 0x5f, 0x30, 0x02, 0xc5, 0x46, 0x52, 0x71, 0x1c, 0x13, - 0xc1, 0x6d, 0x9c, 0x6c, 0x19, 0x6f, 0x1f, 0x7e, 0x9b, 0x58, 0xfc, 0x2d, 0xc2, 0xcd, 0x26, 0x7a, - 0x38, 0xaa, 0xcf, 0x8d, 0x47, 0x75, 0x88, 0x69, 0x38, 0xd2, 0x8a, 0x86, 0x50, 0xee, 0x09, 0xa8, - 0xb7, 0xc8, 0xe0, 0x90, 0x78, 0x7e, 0x35, 0xb7, 0x91, 0xdf, 0x5c, 0xda, 0x7e, 0x65, 0xc6, 0xb0, - 0x1b, 0x7b, 0xb1, 0x8e, 0xe6, 0x33, 0x0a, 0xb0, 0x9c, 0x20, 0xfa, 0x38, 0x05, 0xa3, 0xff, 0x41, - 0x83, 0x4a, 0xd2, 0xd3, 0x7b, 0xd4, 0xe7, 0xe8, 0x1b, 0x13, 0xde, 0x1a, 0x4f, 0xe6, 0xad, 0x90, - 0x96, 0xbe, 0x56, 0x14, 0xf4, 0x62, 0x48, 0x49, 0x78, 0x6a, 0x42, 0x91, 0x72, 0x32, 0x08, 0x5d, - 0x7c, 0x75, 0x56, 0x17, 0x93, 0xe6, 0x36, 0x97, 0x15, 0x50, 0xb1, 0x25, 0x54, 0xe2, 0x40, 0xb3, - 0xfe, 0x41, 0x1e, 0xd6, 0x92, 0x6c, 0x1d, 0x93, 0x5b, 0x47, 0xd7, 0x10, 0xc4, 0x1f, 0x68, 0xb0, - 0x66, 0xda, 0x36, 0xb1, 0xf7, 0xae, 0x38, 0x94, 0x9f, 0x56, 0xb0, 0xc2, 0xab, 0xb4, 0x76, 0x3c, - 0x09, 0x88, 0x7e, 0xa4, 0xc1, 0xba, 0x47, 0x06, 0xec, 0x24, 0x63, 0x48, 0xfe, 0xf2, 0x86, 0x7c, - 0x46, 0x19, 0xb2, 0x8e, 0x27, 0xf5, 0xe3, 0xf3, 0x40, 0xf5, 0x7f, 0x68, 0xb0, 0xb2, 0xe3, 0xba, - 0x7d, 0x4a, 0xec, 0x03, 0xf6, 0x3f, 0x5e, 0x4d, 0x7f, 0xd2, 0x00, 0xa5, 0x7d, 0xbd, 0x86, 0x7a, - 0xb2, 0xd2, 0xf5, 0xf4, 0xfa, 0xcc, 0xf5, 0x94, 0x32, 0x78, 0x4a, 0x45, 0xfd, 0x38, 0x0f, 0xeb, - 0x69, 0xc6, 0x4f, 0x6a, 0xea, 0xbf, 0x57, 0x53, 0xff, 0xd6, 0x60, 0xfd, 0x8d, 0xfe, 0xd0, 0xe7, - 0xc4, 0x4b, 0x19, 0xf9, 0xf4, 0xa3, 0xf1, 0x3d, 0x0d, 0x2a, 0xa4, 0xdb, 0x25, 0x16, 0xa7, 0x27, - 0xe4, 0x0a, 0x83, 0x51, 0x55, 0xa8, 0x95, 0xdd, 0x8c, 0x72, 0x3c, 0x01, 0xa7, 0xff, 0x4d, 0x83, - 0xa5, 0xdd, 0xde, 0xff, 0xc1, 0x70, 0xfe, 0xbd, 0x06, 0xab, 0x09, 0x47, 0xaf, 0xa1, 0x97, 0xbc, - 0x97, 0xee, 0x25, 0x33, 0x7b, 0x98, 0xb0, 0x76, 0x4a, 0x23, 0xf9, 0x49, 0x1e, 0x2a, 0x09, 0xae, - 0xa0, 0x8b, 0xd8, 0x00, 0x2c, 0xda, 0xf7, 0x2b, 0x8d, 0x61, 0x42, 0xef, 0x27, 0x9d, 0xe4, 0x9c, - 0x4e, 0xd2, 0x87, 0x9b, 0xbb, 0x0f, 0x38, 0xf1, 0x1c, 0xb3, 0xbf, 0xeb, 0x70, 0xca, 0x4f, 0x31, - 0xe9, 0x12, 0x8f, 0x38, 0x16, 0x41, 0x1b, 0x50, 0x70, 0xcc, 0x01, 0x91, 0xe1, 0x28, 0x35, 0xcb, - 0x4a, 0x75, 0xa1, 0x6d, 0x0e, 0x08, 0x96, 0x2b, 0xa8, 0x01, 0x25, 0xf1, 0xeb, 0xbb, 0xa6, 0x45, - 0xaa, 0x39, 0xc9, 0xb6, 0xa6, 0xd8, 0x4a, 0xed, 0x70, 0x01, 0xc7, 0x3c, 0xa2, 0x6f, 0x55, 0x24, - 0xfc, 0x8e, 0xef, 0x33, 0x8b, 0x9a, 0x9c, 0x32, 0xe7, 0x7a, 0x46, 0x48, 0xc5, 0x54, 0x88, 0xca, - 0xff, 0x8f, 0x3d, 0x2d, 0xa5, 0x74, 0xb4, 0x49, 0x71, 0xdf, 0xda, 0xc9, 0xe8, 0xc7, 0x13, 0x88, - 0xfa, 0xbf, 0x72, 0xb0, 0x94, 0xd8, 0x7c, 0x74, 0x1f, 0xf2, 0x2e, 0xb3, 0x95, 0xcf, 0x33, 0x1f, - 0x83, 0x3b, 0xcc, 0x8e, 0xcd, 0x58, 0x18, 0x8f, 0xea, 0x79, 0x41, 0x11, 0x1a, 0xd1, 0xf7, 0x35, - 0x58, 0x21, 0xa9, 0xa8, 0xca, 0xe8, 0x2c, 0x6d, 0xef, 0xcd, 0x5c, 0xcf, 0xe7, 0xe7, 0x46, 0x13, - 0x8d, 0x47, 0xf5, 0x95, 0xcc, 0x62, 0x06, 0x12, 0x7d, 0x11, 0xf2, 0xd4, 0x0d, 0xd2, 0xba, 0xdc, - 0x7c, 0x46, 0x18, 0xd8, 0xea, 0xf8, 0x67, 0xa3, 0x7a, 0xa9, 0xd5, 0x51, 0x67, 0x73, 0x2c, 0x18, - 0xd0, 0x37, 0xa1, 0xe8, 0x32, 0x8f, 0xfb, 0xd5, 0x82, 0x8c, 0xc8, 0x57, 0x66, 0xb5, 0x51, 0x64, - 0x9a, 0xdd, 0x61, 0x1e, 0x8f, 0x3b, 0x8e, 0x78, 0xf2, 0x71, 0xa0, 0x56, 0xff, 0xa5, 0x06, 0x2b, - 0xe9, 0xa8, 0xa5, 0x13, 0x57, 0xbb, 0x38, 0x71, 0xa3, 0x5a, 0xc8, 0x4d, 0xad, 0x85, 0x26, 0xe4, - 0x87, 0xd4, 0xae, 0xe6, 0x25, 0xc3, 0x0b, 0x8a, 0x21, 0xff, 0x4e, 0xeb, 0xee, 0xd9, 0xa8, 0xfe, - 0xdc, 0xb4, 0x3b, 0x28, 0x3f, 0x75, 0x89, 0x6f, 0xbc, 0xd3, 0xba, 0x8b, 0x85, 0xb0, 0xfe, 0x5b, - 0x0d, 0x16, 0x5a, 0x9d, 0x66, 0x9f, 0x59, 0xc7, 0xe8, 0x3e, 0x14, 0x2c, 0x6a, 0x7b, 0x2a, 0x3b, - 0x5e, 0x9c, 0x75, 0x53, 0x5a, 0x9d, 0x36, 0xe1, 0xb1, 0xa1, 0x6f, 0xb4, 0xee, 0x62, 0x2c, 0x15, - 0xa2, 0x77, 0x61, 0x9e, 0x3c, 0xb0, 0x88, 0xcb, 0x55, 0x05, 0x7c, 0x4c, 0xd5, 0x2b, 0x4a, 0xf5, - 0xfc, 0xae, 0x54, 0x86, 0x95, 0x52, 0xbd, 0x0b, 0x45, 0xc9, 0x80, 0x3e, 0x07, 0x39, 0xea, 0x4a, - 0xf3, 0xcb, 0xcd, 0xf5, 0xf1, 0xa8, 0x9e, 0x6b, 0x75, 0xd2, 0xc1, 0xcf, 0x51, 0x17, 0xdd, 0x81, - 0xb2, 0xeb, 0x91, 0x2e, 0x7d, 0x70, 0x8f, 0x38, 0x3d, 0x7e, 0x24, 0xf7, 0xb7, 0x18, 0xcf, 0xc6, - 0x4e, 0x62, 0x0d, 0xa7, 0x38, 0xf5, 0x0f, 0x34, 0x28, 0x45, 0x91, 0x17, 0xf1, 0x11, 0xc1, 0x96, - 0x70, 0xc5, 0xd8, 0x6d, 0xb1, 0x86, 0xe5, 0xca, 0x13, 0x44, 0xf0, 0x0e, 0x2c, 0xca, 0xdb, 0xbf, - 0xc5, 0xfa, 0x2a, 0x8c, 0xb7, 0xc2, 0x49, 0xd9, 0x51, 0xf4, 0xb3, 0xc4, 0x7f, 0x1c, 0x71, 0xeb, - 0xff, 0xcc, 0xc3, 0x72, 0x9b, 0xf0, 0xef, 0x30, 0xef, 0xb8, 0xc3, 0xfa, 0xd4, 0x3a, 0xbd, 0x86, - 0x9e, 0xd6, 0x85, 0xa2, 0x37, 0xec, 0x93, 0xb0, 0x8f, 0xed, 0xcc, 0x5c, 0x35, 0x49, 0x7b, 0xf1, - 0xb0, 0x4f, 0xe2, 0xea, 0x11, 0x4f, 0x3e, 0x0e, 0xd4, 0xa3, 0xd7, 0x60, 0xd5, 0x4c, 0x9d, 0xfb, - 0x83, 0x8a, 0x2e, 0xc9, 0x98, 0xae, 0xa6, 0xaf, 0x04, 0x3e, 0xce, 0xf2, 0xa2, 0x4d, 0xb1, 0xa9, - 0x94, 0x79, 0xa2, 0x07, 0x15, 0x36, 0xb4, 0x4d, 0xad, 0x59, 0x0e, 0x36, 0x34, 0xa0, 0xe1, 0x68, - 0x15, 0xdd, 0x86, 0x32, 0xa7, 0xc4, 0x0b, 0x57, 0xaa, 0x45, 0x19, 0xca, 0x8a, 0x48, 0x83, 0x83, - 0x04, 0x1d, 0xa7, 0xb8, 0x90, 0x0f, 0x25, 0x9f, 0x0d, 0x3d, 0x8b, 0x60, 0xd2, 0xad, 0xce, 0xcb, - 0x9d, 0x7e, 0xf3, 0x72, 0x5b, 0x11, 0xf5, 0xb8, 0x65, 0xd1, 0x0d, 0xf6, 0x43, 0xe5, 0x38, 0xc6, - 0xd1, 0xff, 0xa8, 0xc1, 0x5a, 0x4a, 0xe8, 0x1a, 0x4e, 0x66, 0x87, 0xe9, 0x93, 0xd9, 0x6b, 0x97, - 0x72, 0x72, 0xca, 0xd9, 0xec, 0xbb, 0x70, 0x33, 0xc5, 0xd6, 0x66, 0x36, 0xd9, 0xe7, 0x26, 0x1f, - 0xfa, 0xe8, 0x4b, 0xb0, 0xe8, 0x30, 0x9b, 0xb4, 0xe3, 0x03, 0x41, 0x64, 0x6c, 0x5b, 0xd1, 0x71, - 0xc4, 0x81, 0xb6, 0x01, 0xd4, 0x2b, 0x35, 0xca, 0x1c, 0x59, 0x72, 0xf9, 0x38, 0x9d, 0xf7, 0xa2, - 0x15, 0x9c, 0xe0, 0xd2, 0x7f, 0x9d, 0xdd, 0xd4, 0x0e, 0x21, 0x1e, 0x7a, 0x19, 0x96, 0xcd, 0xc4, - 0x8b, 0x1c, 0xbf, 0xaa, 0xc9, 0xe4, 0x5b, 0x1b, 0x8f, 0xea, 0xcb, 0xc9, 0x37, 0x3c, 0x3e, 0x4e, - 0xf3, 0x21, 0x02, 0x8b, 0xd4, 0x95, 0xad, 0x34, 0xdc, 0xb2, 0x97, 0x67, 0x6f, 0x74, 0x52, 0x3e, - 0xf6, 0x54, 0x11, 0x7c, 0x1c, 0xa9, 0x16, 0x77, 0x91, 0x4f, 0x9d, 0x9f, 0x3f, 0xe8, 0x45, 0x28, - 0x88, 0xfe, 0xae, 0xb6, 0xeb, 0xb9, 0xb0, 0xe3, 0x1c, 0x9c, 0xba, 0xe4, 0x6c, 0x54, 0x4f, 0xfb, - 0x2a, 0x88, 0x58, 0xb2, 0xcf, 0x7c, 0xa8, 0x8a, 0x3a, 0x5b, 0xfe, 0xa2, 0xd9, 0x54, 0xb8, 0xcc, - 0x6c, 0xfa, 0x45, 0x31, 0x13, 0x1e, 0xd1, 0x25, 0xd0, 0xab, 0x50, 0xb2, 0xa9, 0x27, 0xae, 0x67, - 0xcc, 0x51, 0x8e, 0xd6, 0x42, 0x63, 0xef, 0x86, 0x0b, 0x67, 0xc9, 0x07, 0x1c, 0x0b, 0x20, 0x0b, - 0x0a, 0x5d, 0x8f, 0x0d, 0xd4, 0xe1, 0xe4, 0x72, 0x2d, 0x4c, 0x64, 0x4b, 0xec, 0xfc, 0x9b, 0x1e, - 0x1b, 0x60, 0xa9, 0x1c, 0xbd, 0x0b, 0x39, 0xce, 0xe4, 0xe6, 0x5c, 0x09, 0x04, 0x28, 0x88, 0xdc, - 0x01, 0xc3, 0x39, 0xce, 0x44, 0x9e, 0xf9, 0xc4, 0x3b, 0xa1, 0x16, 0x09, 0x0f, 0x30, 0x33, 0xe7, - 0xd9, 0x7e, 0x20, 0x1f, 0xe7, 0x99, 0x22, 0xf8, 0x38, 0x52, 0x2d, 0xea, 0xcf, 0xcd, 0x74, 0xc6, - 0x78, 0x38, 0x4d, 0xf4, 0xd2, 0xfb, 0x30, 0x6f, 0x06, 0x31, 0x99, 0x97, 0x31, 0xf9, 0x9a, 0x18, - 0xd4, 0x3b, 0x61, 0x30, 0xb6, 0x1e, 0xf3, 0x29, 0xc2, 0xb3, 0xa3, 0x0f, 0x03, 0x86, 0x88, 0x70, - 0x20, 0x84, 0x95, 0x3a, 0xf4, 0x0a, 0x2c, 0x13, 0xc7, 0x3c, 0xec, 0x93, 0x7b, 0xac, 0xd7, 0xa3, - 0x4e, 0xaf, 0xba, 0xb0, 0xa1, 0x6d, 0x2e, 0x36, 0x6f, 0x28, 0x5b, 0x96, 0x77, 0x93, 0x8b, 0x38, - 0xcd, 0x7b, 0xde, 0x28, 0x59, 0x9c, 0x61, 0x94, 0x84, 0x79, 0x5e, 0x9a, 0x96, 0xe7, 0xfa, 0x4f, - 0xf3, 0x80, 0x52, 0x11, 0x13, 0xcd, 0xcb, 0x17, 0xc7, 0xe1, 0x65, 0x27, 0x49, 0x56, 0xed, 0xf9, - 0xaa, 0x06, 0x45, 0xe4, 0x7d, 0x7a, 0x3d, 0x8d, 0x89, 0x5c, 0x28, 0x73, 0xcf, 0xec, 0x76, 0xa9, - 0x25, 0xad, 0x52, 0x49, 0xff, 0xd2, 0x63, 0x6c, 0x90, 0xdf, 0x69, 0x8c, 0x28, 0x1c, 0x07, 0x09, - 0xe9, 0xf8, 0x88, 0x94, 0xa4, 0xe2, 0x14, 0x02, 0x7a, 0x5f, 0x83, 0x8a, 0x18, 0xe2, 0x49, 0x16, - 0x75, 0xcb, 0xfc, 0xea, 0x93, 0xc3, 0xe2, 0x8c, 0x86, 0xf8, 0xca, 0x93, 0x5d, 0xc1, 0x13, 0x68, - 0xfa, 0x5f, 0x35, 0x58, 0x9f, 0x88, 0xc8, 0xf0, 0x3a, 0x5e, 0x54, 0xf5, 0xa1, 0x28, 0xc6, 0x51, - 0xd8, 0xfc, 0xf7, 0x2e, 0x15, 0xeb, 0x78, 0x10, 0xc6, 0x93, 0x53, 0xd0, 0x7c, 0x1c, 0x80, 0xe8, - 0xbf, 0x2b, 0x40, 0x25, 0x64, 0xf2, 0xf7, 0x87, 0x83, 0x81, 0xe9, 0x5d, 0xc7, 0x21, 0xf0, 0x87, - 0x1a, 0xac, 0x26, 0xb3, 0x8c, 0x46, 0xfe, 0x36, 0x2f, 0xe5, 0x6f, 0x10, 0xe8, 0x9b, 0x0a, 0x7b, - 0xb5, 0x9d, 0x86, 0xc0, 0x59, 0x4c, 0xf4, 0x2b, 0x0d, 0x6e, 0x05, 0x28, 0xea, 0xad, 0x64, 0x46, - 0x42, 0x65, 0xdd, 0x55, 0x18, 0xf5, 0x79, 0x65, 0xd4, 0xad, 0x9d, 0xc7, 0xe0, 0xe1, 0xc7, 0x5a, - 0x83, 0x7e, 0xae, 0xc1, 0x8d, 0x80, 0x21, 0x6b, 0x67, 0xe1, 0xca, 0xec, 0xfc, 0xac, 0xb2, 0xf3, - 0xc6, 0xce, 0x79, 0x40, 0xf8, 0x7c, 0x7c, 0xdd, 0x84, 0x72, 0xf2, 0x5e, 0xff, 0x34, 0xde, 0xc1, - 0xfc, 0x46, 0x83, 0x05, 0x35, 0x60, 0xd0, 0xed, 0xc4, 0x95, 0x27, 0x80, 0xa8, 0x5e, 0x7c, 0xdd, - 0x41, 0x6d, 0x75, 0xd9, 0xca, 0x5d, 0x90, 0xd3, 0x43, 0x4e, 0xfb, 0x46, 0xf0, 0x85, 0xd5, 0x68, - 0x39, 0xfc, 0x6d, 0x6f, 0x9f, 0x7b, 0xd4, 0xe9, 0x35, 0x17, 0x33, 0x57, 0xb3, 0x2f, 0xc0, 0x02, - 0x71, 0xe4, 0x3d, 0x4e, 0x8e, 0xe9, 0x62, 0x73, 0x69, 0x3c, 0xaa, 0x2f, 0xec, 0x06, 0x24, 0x1c, - 0xae, 0xe9, 0x04, 0x2a, 0xca, 0xee, 0xa7, 0xb9, 0x3f, 0xcd, 0xe7, 0x1f, 0x3e, 0xaa, 0xcd, 0x7d, - 0xf8, 0xa8, 0x36, 0xf7, 0xd1, 0xa3, 0xda, 0xdc, 0xfb, 0xe3, 0x9a, 0xf6, 0x70, 0x5c, 0xd3, 0x3e, - 0x1c, 0xd7, 0xb4, 0x8f, 0xc6, 0x35, 0xed, 0xcf, 0xe3, 0x9a, 0xf6, 0xb3, 0xbf, 0xd4, 0xe6, 0xbe, - 0xbe, 0xa0, 0x42, 0xff, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x50, 0x14, 0x7b, 0x97, 0xd8, 0x1f, - 0x00, 0x00, + 0x15, 0x9e, 0xf6, 0x4f, 0x12, 0xbf, 0x38, 0x89, 0x53, 0xd9, 0x61, 0xcc, 0x32, 0xd8, 0xd9, 0xe6, + 0x47, 0x39, 0xb0, 0xed, 0x4d, 0x98, 0xdd, 0x1d, 0xd8, 0x1f, 0x14, 0xef, 0x64, 0x23, 0x4b, 0xb3, + 0x5e, 0xab, 0x92, 0xd5, 0x48, 0x88, 0x85, 0xed, 0x74, 0x97, 0x9d, 0x22, 0x76, 0x57, 0xab, 0xbb, + 0x1c, 0x26, 0x42, 0x42, 0x8b, 0x80, 0xc3, 0x02, 0x12, 0xdc, 0x38, 0x73, 0xe2, 0xc2, 0x0d, 0x89, + 0x3b, 0x07, 0xa4, 0x39, 0x2e, 0x42, 0x88, 0x3d, 0x59, 0x8c, 0x11, 0x20, 0x0e, 0xdc, 0x38, 0x65, + 0x2f, 0xa8, 0xaa, 0xab, 0x7f, 0x1d, 0x4f, 0xc6, 0x93, 0x4c, 0x90, 0x60, 0x4f, 0x76, 0x57, 0xbd, + 0xf7, 0xbe, 0xf7, 0xea, 0x7b, 0xf5, 0x5e, 0x55, 0x37, 0xbc, 0x6e, 0x3a, 0xdc, 0x23, 0xa6, 0x41, + 0x59, 0x23, 0xf8, 0xd7, 0x70, 0x8f, 0x7a, 0x0d, 0xd3, 0xa5, 0x7e, 0xc3, 0x62, 0x0e, 0xf7, 0x58, + 0xdf, 0xed, 0x9b, 0x0e, 0x69, 0x1c, 0x6f, 0x1e, 0x10, 0x6e, 0x6e, 0x35, 0x7a, 0xc4, 0x21, 0x9e, + 0xc9, 0x89, 0x6d, 0xb8, 0x1e, 0xe3, 0x0c, 0x19, 0x81, 0xd6, 0xb7, 0x28, 0x53, 0xff, 0x0c, 0xf7, + 0xa8, 0x67, 0x08, 0x7d, 0x23, 0xa9, 0x6f, 0x28, 0xfd, 0x67, 0x6f, 0x4f, 0xc7, 0xf3, 0xb9, 0xc9, + 0xfd, 0xc6, 0xf1, 0xa6, 0xd9, 0x77, 0x0f, 0xcd, 0xcd, 0x2c, 0xd2, 0xb3, 0xcf, 0xf7, 0x28, 0x3f, + 0x1c, 0x1e, 0x18, 0x16, 0x1b, 0x34, 0x7a, 0xac, 0xc7, 0x1a, 0x72, 0xf8, 0x60, 0xd8, 0x95, 0x4f, + 0xf2, 0x41, 0xfe, 0x53, 0xe2, 0xb7, 0x8e, 0x6e, 0xfb, 0x12, 0xc5, 0xa5, 0x03, 0xd3, 0x3a, 0xa4, + 0x0e, 0xf1, 0x4e, 0x62, 0xac, 0x01, 0xe1, 0x66, 0xe3, 0x78, 0x12, 0xa4, 0x31, 0x4d, 0xcb, 0x1b, + 0x3a, 0x9c, 0x0e, 0xc8, 0x84, 0xc2, 0x4b, 0xe7, 0x29, 0xf8, 0xd6, 0x21, 0x19, 0x98, 0x13, 0x7a, + 0x5f, 0x9e, 0xa6, 0x37, 0xe4, 0xb4, 0xdf, 0xa0, 0x0e, 0xf7, 0xb9, 0x97, 0x55, 0xd2, 0xff, 0xa1, + 0x41, 0x79, 0xdb, 0xb6, 0x3d, 0xe2, 0xfb, 0xbb, 0x1e, 0x1b, 0xba, 0xe8, 0x3d, 0x58, 0x10, 0x91, + 0xd8, 0x26, 0x37, 0xab, 0xda, 0xba, 0xb6, 0xb1, 0xb8, 0xf5, 0x82, 0x11, 0x18, 0x36, 0x92, 0x86, + 0x63, 0x4e, 0x84, 0xb4, 0x71, 0xbc, 0x69, 0xbc, 0x7d, 0xf0, 0x6d, 0x62, 0xf1, 0xb7, 0x08, 0x37, + 0x9b, 0xe8, 0xc1, 0xa8, 0x7e, 0x6d, 0x3c, 0xaa, 0x43, 0x3c, 0x86, 0x23, 0xab, 0x68, 0x08, 0xe5, + 0x9e, 0x80, 0x7a, 0x8b, 0x0c, 0x0e, 0x88, 0xe7, 0x57, 0x73, 0xeb, 0xf9, 0x8d, 0xc5, 0xad, 0x57, + 0x66, 0xa4, 0xdd, 0xd8, 0x8d, 0x6d, 0x34, 0x9f, 0x51, 0x80, 0xe5, 0xc4, 0xa0, 0x8f, 0x53, 0x30, + 0xfa, 0x1f, 0x35, 0xa8, 0x24, 0x23, 0xbd, 0x4b, 0x7d, 0x8e, 0xbe, 0x31, 0x11, 0xad, 0xf1, 0x78, + 0xd1, 0x0a, 0x6d, 0x19, 0x6b, 0x45, 0x41, 0x2f, 0x84, 0x23, 0x89, 0x48, 0x4d, 0x28, 0x52, 0x4e, + 0x06, 0x61, 0x88, 0xaf, 0xce, 0x1a, 0x62, 0xd2, 0xdd, 0xe6, 0x92, 0x02, 0x2a, 0xb6, 0x84, 0x49, + 0x1c, 0x58, 0xd6, 0x3f, 0xc8, 0xc3, 0x6a, 0x52, 0xac, 0x63, 0x72, 0xeb, 0xf0, 0x0a, 0x48, 0xfc, + 0xa1, 0x06, 0xab, 0xa6, 0x6d, 0x13, 0x7b, 0xf7, 0x92, 0xa9, 0xfc, 0xb4, 0x82, 0x15, 0x51, 0xa5, + 0xad, 0xe3, 0x49, 0x40, 0xf4, 0x63, 0x0d, 0xd6, 0x3c, 0x32, 0x60, 0xc7, 0x19, 0x47, 0xf2, 0x17, + 0x77, 0xe4, 0x33, 0xca, 0x91, 0x35, 0x3c, 0x69, 0x1f, 0x9f, 0x05, 0xaa, 0xff, 0x53, 0x83, 0xe5, + 0x6d, 0xd7, 0xed, 0x53, 0x62, 0xef, 0xb3, 0xff, 0xf1, 0xdd, 0xf4, 0x67, 0x0d, 0x50, 0x3a, 0xd6, + 0x2b, 0xd8, 0x4f, 0x56, 0x7a, 0x3f, 0xbd, 0x3e, 0xf3, 0x7e, 0x4a, 0x39, 0x3c, 0x65, 0x47, 0xfd, + 0x24, 0x0f, 0x6b, 0x69, 0xc1, 0x4f, 0xf6, 0xd4, 0x7f, 0x6f, 0x4f, 0x7d, 0x9c, 0x83, 0xb5, 0x37, + 0xfa, 0x43, 0x9f, 0x13, 0x2f, 0xe5, 0xe4, 0xd3, 0x67, 0xe3, 0xfb, 0x1a, 0x54, 0x48, 0xb7, 0x4b, + 0x2c, 0x4e, 0x8f, 0xc9, 0x25, 0x92, 0x51, 0x55, 0xa8, 0x95, 0x9d, 0x8c, 0x71, 0x3c, 0x01, 0x87, + 0xbe, 0x07, 0xab, 0xd1, 0x58, 0xab, 0xd3, 0xec, 0x33, 0xeb, 0x28, 0xe4, 0xe1, 0xc5, 0x59, 0x7d, + 0x68, 0x75, 0xda, 0x84, 0xc7, 0xa9, 0xb0, 0x93, 0xb5, 0x8b, 0x27, 0xa1, 0xf4, 0xbf, 0x6b, 0xb0, + 0xb8, 0xd3, 0xfb, 0x3f, 0x38, 0x1c, 0xfc, 0x41, 0x83, 0x95, 0x44, 0xa0, 0x57, 0x50, 0xcb, 0xde, + 0x4b, 0xd7, 0xb2, 0x99, 0x23, 0x4c, 0x78, 0x3b, 0xa5, 0x90, 0xfd, 0x34, 0x0f, 0x95, 0x84, 0x54, + 0x50, 0xc5, 0x6c, 0x00, 0x16, 0xad, 0xfb, 0xa5, 0x72, 0x98, 0xb0, 0xfb, 0x49, 0x25, 0x3b, 0xa3, + 0x92, 0xf5, 0xe1, 0xc6, 0xce, 0x7d, 0x4e, 0x3c, 0xc7, 0xec, 0xef, 0x38, 0x9c, 0xf2, 0x13, 0x4c, + 0xba, 0xc4, 0x23, 0x8e, 0x45, 0xd0, 0x3a, 0x14, 0x1c, 0x73, 0x40, 0x24, 0x1d, 0xa5, 0x66, 0x59, + 0x99, 0x2e, 0xb4, 0xcd, 0x01, 0xc1, 0x72, 0x06, 0x35, 0xa0, 0x24, 0x7e, 0x7d, 0xd7, 0xb4, 0x48, + 0x35, 0x27, 0xc5, 0x56, 0x95, 0x58, 0xa9, 0x1d, 0x4e, 0xe0, 0x58, 0x46, 0xff, 0x58, 0x83, 0x8a, + 0x84, 0xdf, 0xf6, 0x7d, 0x66, 0x51, 0x93, 0x53, 0xe6, 0x5c, 0x4d, 0x0b, 0xab, 0x98, 0x0a, 0x51, + 0xc5, 0xff, 0xc4, 0xdd, 0x5a, 0x6a, 0x47, 0x8b, 0x14, 0xd7, 0xcd, 0xed, 0x8c, 0x7d, 0x3c, 0x81, + 0xa8, 0xff, 0x3b, 0x07, 0x8b, 0x89, 0xc5, 0x47, 0xf7, 0x20, 0xef, 0x32, 0x5b, 0xc5, 0x3c, 0xf3, + 0x31, 0xbc, 0xc3, 0xec, 0xd8, 0x8d, 0xf9, 0xf1, 0xa8, 0x9e, 0x17, 0x23, 0xc2, 0x22, 0xfa, 0x81, + 0x06, 0xcb, 0x24, 0xc5, 0xaa, 0x64, 0x67, 0x71, 0x6b, 0x77, 0xe6, 0xfd, 0x7c, 0x76, 0x6e, 0x34, + 0xd1, 0x78, 0x54, 0x5f, 0xce, 0x4c, 0x66, 0x20, 0xd1, 0x17, 0x21, 0x4f, 0xdd, 0x20, 0xad, 0xcb, + 0xcd, 0x67, 0x84, 0x83, 0xad, 0x8e, 0x7f, 0x3a, 0xaa, 0x97, 0x5a, 0x1d, 0x75, 0x37, 0xc0, 0x42, + 0x00, 0x7d, 0x13, 0x8a, 0x2e, 0xf3, 0xb8, 0x5f, 0x2d, 0x48, 0x46, 0xbe, 0x32, 0xab, 0x8f, 0x22, + 0xd3, 0xec, 0x0e, 0xf3, 0x78, 0x5c, 0x71, 0xc4, 0x93, 0x8f, 0x03, 0xb3, 0xfa, 0xaf, 0x34, 0x58, + 0x4e, 0xb3, 0x96, 0x4e, 0x5c, 0xed, 0xfc, 0xc4, 0x8d, 0xf6, 0x42, 0x6e, 0xea, 0x5e, 0x68, 0x42, + 0x7e, 0x48, 0xed, 0x6a, 0x5e, 0x0a, 0xbc, 0xa0, 0x04, 0xf2, 0xef, 0xb4, 0xee, 0x9c, 0x8e, 0xea, + 0xcf, 0x4d, 0xbb, 0x03, 0xf3, 0x13, 0x97, 0xf8, 0xc6, 0x3b, 0xad, 0x3b, 0x58, 0x28, 0xeb, 0xbf, + 0xd3, 0x60, 0x5e, 0x75, 0x39, 0x74, 0x0f, 0x0a, 0x16, 0xb5, 0x3d, 0x95, 0x1d, 0x4f, 0xd8, 0x57, + 0x23, 0x47, 0xdf, 0x68, 0xdd, 0xc1, 0x58, 0x1a, 0x44, 0xef, 0xc2, 0x1c, 0xb9, 0x6f, 0x11, 0x97, + 0xab, 0x1d, 0xf0, 0x84, 0xa6, 0x97, 0x95, 0xe9, 0xb9, 0x1d, 0x69, 0x0c, 0x2b, 0xa3, 0x7a, 0x17, + 0x8a, 0x52, 0x00, 0x7d, 0x0e, 0x72, 0xd4, 0x95, 0xee, 0x97, 0x9b, 0x6b, 0xe3, 0x51, 0x3d, 0xd7, + 0xea, 0xa4, 0xc9, 0xcf, 0x51, 0x17, 0xdd, 0x86, 0xb2, 0xeb, 0x91, 0x2e, 0xbd, 0x7f, 0x97, 0x38, + 0x3d, 0x7e, 0x28, 0xd7, 0xb7, 0x18, 0xf7, 0xc6, 0x4e, 0x62, 0x0e, 0xa7, 0x24, 0xf5, 0x0f, 0x34, + 0x28, 0x45, 0xcc, 0x0b, 0x7e, 0x04, 0xd9, 0x12, 0xae, 0x18, 0x87, 0x2d, 0xe6, 0xb0, 0x9c, 0x79, + 0x0c, 0x06, 0x6f, 0xc3, 0x82, 0x7c, 0xfb, 0x60, 0xb1, 0xbe, 0xa2, 0xf1, 0x66, 0xd8, 0x29, 0x3b, + 0x6a, 0xfc, 0x34, 0xf1, 0x1f, 0x47, 0xd2, 0xfa, 0xbf, 0xf2, 0xb0, 0xd4, 0x26, 0xfc, 0x3b, 0xcc, + 0x3b, 0xea, 0xb0, 0x3e, 0xb5, 0x4e, 0xae, 0xa0, 0xa6, 0x75, 0xa1, 0xe8, 0x0d, 0xfb, 0x24, 0xac, + 0x63, 0xdb, 0x33, 0xef, 0x9a, 0xa4, 0xbf, 0x78, 0xd8, 0x27, 0xf1, 0xee, 0x11, 0x4f, 0x3e, 0x0e, + 0xcc, 0xa3, 0xd7, 0x60, 0xc5, 0x4c, 0xdd, 0x3b, 0x82, 0x1d, 0x5d, 0x92, 0x9c, 0xae, 0xa4, 0xaf, + 0x24, 0x3e, 0xce, 0xca, 0xa2, 0x0d, 0xb1, 0xa8, 0x94, 0x79, 0xa2, 0x06, 0x15, 0xd6, 0xb5, 0x0d, + 0xad, 0x59, 0x0e, 0x16, 0x34, 0x18, 0xc3, 0xd1, 0x2c, 0xba, 0x05, 0x65, 0x4e, 0x89, 0x17, 0xce, + 0x54, 0x8b, 0x92, 0xca, 0x8a, 0x48, 0x83, 0xfd, 0xc4, 0x38, 0x4e, 0x49, 0x21, 0x1f, 0x4a, 0x3e, + 0x1b, 0x7a, 0x16, 0xc1, 0xa4, 0x5b, 0x9d, 0x93, 0x2b, 0xfd, 0xe6, 0xc5, 0x96, 0x22, 0xaa, 0x71, + 0x4b, 0xa2, 0x1a, 0xec, 0x85, 0xc6, 0x71, 0x8c, 0xa3, 0xff, 0x49, 0x83, 0xd5, 0x94, 0xd2, 0x15, + 0x9c, 0xcc, 0x0e, 0xd2, 0x27, 0xb3, 0xd7, 0x2e, 0x14, 0xe4, 0x94, 0xb3, 0xd9, 0x77, 0xe1, 0x46, + 0x4a, 0xac, 0xcd, 0x6c, 0xb2, 0xc7, 0x4d, 0x3e, 0xf4, 0xd1, 0x97, 0x60, 0xc1, 0x61, 0x36, 0x69, + 0xc7, 0x07, 0x82, 0xc8, 0xd9, 0xb6, 0x1a, 0xc7, 0x91, 0x04, 0xda, 0x02, 0x50, 0xaf, 0xf4, 0x28, + 0x73, 0xe4, 0x96, 0xcb, 0xc7, 0xe9, 0xbc, 0x1b, 0xcd, 0xe0, 0x84, 0x94, 0xfe, 0x9b, 0xec, 0xa2, + 0x76, 0x08, 0xf1, 0xd0, 0xcb, 0xb0, 0x64, 0x26, 0x5e, 0x24, 0xf9, 0x55, 0x4d, 0x26, 0xdf, 0xea, + 0x78, 0x54, 0x5f, 0x4a, 0xbe, 0x61, 0xf2, 0x71, 0x5a, 0x0e, 0x11, 0x58, 0xa0, 0xae, 0xba, 0x9b, + 0x04, 0x4b, 0xf6, 0xf2, 0xec, 0x85, 0x4e, 0xea, 0xc7, 0x91, 0x46, 0x97, 0x92, 0xc8, 0xb4, 0xb8, + 0x8b, 0x7c, 0xea, 0xec, 0xfc, 0x41, 0x2f, 0x42, 0x41, 0xd4, 0x77, 0xb5, 0x5c, 0xcf, 0x85, 0x15, + 0x67, 0xff, 0xc4, 0x25, 0xa7, 0xa3, 0x7a, 0x3a, 0x56, 0x31, 0x88, 0xa5, 0xf8, 0xcc, 0x87, 0xaa, + 0xa8, 0xb2, 0xe5, 0xcf, 0xeb, 0x4d, 0x85, 0x8b, 0xf4, 0xa6, 0x5f, 0x16, 0x33, 0xf4, 0x88, 0x2a, + 0x81, 0x5e, 0x85, 0x92, 0x4d, 0x3d, 0x71, 0x3f, 0x63, 0x8e, 0x0a, 0xb4, 0x16, 0x3a, 0x7b, 0x27, + 0x9c, 0x38, 0x4d, 0x3e, 0xe0, 0x58, 0x01, 0x59, 0x50, 0xe8, 0x7a, 0x6c, 0xa0, 0x0e, 0x27, 0x17, + 0x2b, 0x61, 0x22, 0x5b, 0xe2, 0xe0, 0xdf, 0xf4, 0xd8, 0x00, 0x4b, 0xe3, 0xe8, 0x5d, 0xc8, 0x71, + 0x26, 0x17, 0xe7, 0x52, 0x20, 0x40, 0x41, 0xe4, 0xf6, 0x19, 0xce, 0x71, 0x26, 0xf2, 0xcc, 0x27, + 0xde, 0x31, 0xb5, 0x48, 0x78, 0x80, 0x99, 0x39, 0xcf, 0xf6, 0x02, 0xfd, 0x38, 0xcf, 0xd4, 0x80, + 0x8f, 0x23, 0xd3, 0x62, 0xff, 0xb9, 0x99, 0xca, 0x18, 0x37, 0xa7, 0x89, 0x5a, 0x7a, 0x0f, 0xe6, + 0xcc, 0x80, 0x93, 0x39, 0xc9, 0xc9, 0xd7, 0x44, 0xa3, 0xde, 0x0e, 0xc9, 0xd8, 0x7c, 0xc4, 0xa7, + 0x10, 0xcf, 0x8e, 0x3e, 0x4c, 0x18, 0x82, 0xe1, 0x40, 0x09, 0x2b, 0x73, 0xe8, 0x15, 0x58, 0x22, + 0x8e, 0x79, 0xd0, 0x27, 0x77, 0x59, 0xaf, 0x47, 0x9d, 0x5e, 0x75, 0x7e, 0x5d, 0xdb, 0x58, 0x68, + 0x5e, 0x57, 0xbe, 0x2c, 0xed, 0x24, 0x27, 0x71, 0x5a, 0xf6, 0xac, 0x56, 0xb2, 0x30, 0x43, 0x2b, + 0x09, 0xf3, 0xbc, 0x34, 0x2d, 0xcf, 0xf5, 0x9f, 0xe5, 0x01, 0xa5, 0x18, 0x13, 0xc5, 0xcb, 0x17, + 0xc7, 0xe1, 0x25, 0x27, 0x39, 0xac, 0xca, 0xf3, 0x65, 0x35, 0x8a, 0x28, 0xfa, 0xf4, 0x7c, 0x1a, + 0x13, 0xb9, 0x50, 0xe6, 0x9e, 0xd9, 0xed, 0x52, 0x4b, 0x7a, 0xa5, 0x92, 0xfe, 0xa5, 0x47, 0xf8, + 0x20, 0xbf, 0x13, 0x19, 0x11, 0x1d, 0xfb, 0x09, 0xed, 0xf8, 0x88, 0x94, 0x1c, 0xc5, 0x29, 0x04, + 0xf4, 0xbe, 0x06, 0x15, 0xd1, 0xc4, 0x93, 0x22, 0xea, 0x96, 0xf9, 0xd5, 0xc7, 0x87, 0xc5, 0x19, + 0x0b, 0xf1, 0x95, 0x27, 0x3b, 0x83, 0x27, 0xd0, 0xf4, 0xbf, 0x69, 0xb0, 0x36, 0xc1, 0xc8, 0xf0, + 0x2a, 0x5e, 0x94, 0xf5, 0xa1, 0x28, 0xda, 0x51, 0x58, 0xfc, 0x77, 0x2f, 0xc4, 0x75, 0xdc, 0x08, + 0xe3, 0xce, 0x29, 0xc6, 0x7c, 0x1c, 0x80, 0xe8, 0xbf, 0x2f, 0x40, 0x25, 0x14, 0xf2, 0xf7, 0x86, + 0x83, 0x81, 0xe9, 0x5d, 0xc5, 0x21, 0xf0, 0x47, 0x1a, 0xac, 0x24, 0xb3, 0x8c, 0x46, 0xf1, 0x36, + 0x2f, 0x14, 0x6f, 0x40, 0xf4, 0x0d, 0x85, 0xbd, 0xd2, 0x4e, 0x43, 0xe0, 0x2c, 0x26, 0xfa, 0xb5, + 0x06, 0x37, 0x03, 0x14, 0xf5, 0x56, 0x34, 0xa3, 0xa1, 0xb2, 0xee, 0x32, 0x9c, 0xfa, 0xbc, 0x72, + 0xea, 0xe6, 0xf6, 0x23, 0xf0, 0xf0, 0x23, 0xbd, 0x41, 0xbf, 0xd0, 0xe0, 0x7a, 0x20, 0x90, 0xf5, + 0xb3, 0x70, 0x69, 0x7e, 0x7e, 0x56, 0xf9, 0x79, 0x7d, 0xfb, 0x2c, 0x20, 0x7c, 0x36, 0xbe, 0x6e, + 0x42, 0x39, 0x79, 0xaf, 0x7f, 0x1a, 0xef, 0x60, 0x7e, 0xab, 0xc1, 0xbc, 0x6a, 0x30, 0xe8, 0x56, + 0xe2, 0xca, 0x13, 0x40, 0x54, 0xcf, 0xbf, 0xee, 0xa0, 0xb6, 0xba, 0x6c, 0xe5, 0xce, 0xc9, 0xe9, + 0x21, 0xa7, 0x7d, 0x23, 0xf8, 0xc2, 0x6b, 0xb4, 0x1c, 0xfe, 0xb6, 0xb7, 0xc7, 0x3d, 0xea, 0xf4, + 0x9a, 0x0b, 0x99, 0xab, 0xd9, 0x17, 0x60, 0x9e, 0x38, 0xf2, 0x1e, 0x27, 0xdb, 0x74, 0xb1, 0xb9, + 0x38, 0x1e, 0xd5, 0xe7, 0x77, 0x82, 0x21, 0x1c, 0xce, 0xe9, 0x04, 0x2a, 0xca, 0xef, 0xa7, 0xb9, + 0x3e, 0xcd, 0xe7, 0x1f, 0x3c, 0xac, 0x5d, 0xfb, 0xf0, 0x61, 0xed, 0xda, 0x47, 0x0f, 0x6b, 0xd7, + 0xde, 0x1f, 0xd7, 0xb4, 0x07, 0xe3, 0x9a, 0xf6, 0xe1, 0xb8, 0xa6, 0x7d, 0x34, 0xae, 0x69, 0x7f, + 0x19, 0xd7, 0xb4, 0x9f, 0xff, 0xb5, 0x76, 0xed, 0xeb, 0xf3, 0x8a, 0xfa, 0xff, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x1f, 0xcf, 0xde, 0xf1, 0x58, 0x20, 0x00, 0x00, } func (m *AddressGroup) Marshal() (dAtA []byte, err error) { @@ -1344,6 +1345,20 @@ func (m *ClusterGroupMembers) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.EffectiveIPBlocks) > 0 { + for iNdEx := len(m.EffectiveIPBlocks) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.EffectiveIPBlocks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } if len(m.EffectiveMembers) > 0 { for iNdEx := len(m.EffectiveMembers) - 1; iNdEx >= 0; iNdEx-- { { @@ -2601,6 +2616,12 @@ func (m *ClusterGroupMembers) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } + if len(m.EffectiveIPBlocks) > 0 { + for _, e := range m.EffectiveIPBlocks { + l = e.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + } return n } @@ -3149,9 +3170,15 @@ func (this *ClusterGroupMembers) String() string { repeatedStringForEffectiveMembers += strings.Replace(strings.Replace(f.String(), "GroupMember", "GroupMember", 1), `&`, ``, 1) + "," } repeatedStringForEffectiveMembers += "}" + repeatedStringForEffectiveIPBlocks := "[]IPNet{" + for _, f := range this.EffectiveIPBlocks { + repeatedStringForEffectiveIPBlocks += strings.Replace(strings.Replace(f.String(), "IPNet", "IPNet", 1), `&`, ``, 1) + "," + } + repeatedStringForEffectiveIPBlocks += "}" s := strings.Join([]string{`&ClusterGroupMembers{`, `ObjectMeta:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ObjectMeta), "ObjectMeta", "v1.ObjectMeta", 1), `&`, ``, 1) + `,`, `EffectiveMembers:` + repeatedStringForEffectiveMembers + `,`, + `EffectiveIPBlocks:` + repeatedStringForEffectiveIPBlocks + `,`, `}`, }, "") return s @@ -4374,6 +4401,40 @@ func (m *ClusterGroupMembers) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EffectiveIPBlocks", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EffectiveIPBlocks = append(m.EffectiveIPBlocks, IPNet{}) + if err := m.EffectiveIPBlocks[len(m.EffectiveIPBlocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/pkg/apis/controlplane/v1beta2/generated.proto b/pkg/apis/controlplane/v1beta2/generated.proto index 0e982a844f0..dd321296194 100644 --- a/pkg/apis/controlplane/v1beta2/generated.proto +++ b/pkg/apis/controlplane/v1beta2/generated.proto @@ -74,11 +74,13 @@ message AppliedToGroupPatch { repeated GroupMember removedGroupMembers = 3; } -// ClusterGroupMembers is a list of GroupMember objects that are currently selected by a ClusterGroup. +// ClusterGroupMembers is a list of GroupMember objects or ipBlocks that are currently selected by a ClusterGroup. message ClusterGroupMembers { optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; repeated GroupMember effectiveMembers = 2; + + repeated IPNet effectiveIPBlocks = 3; } message EgressGroup { diff --git a/pkg/apis/controlplane/v1beta2/types.go b/pkg/apis/controlplane/v1beta2/types.go index b0fad8218a2..24ee2101a56 100644 --- a/pkg/apis/controlplane/v1beta2/types.go +++ b/pkg/apis/controlplane/v1beta2/types.go @@ -87,11 +87,12 @@ type GroupMember struct { // +genclient:onlyVerbs=get // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// ClusterGroupMembers is a list of GroupMember objects that are currently selected by a ClusterGroup. +// ClusterGroupMembers is a list of GroupMember objects or ipBlocks that are currently selected by a ClusterGroup. type ClusterGroupMembers struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` EffectiveMembers []GroupMember `json:"effectiveMembers" protobuf:"bytes,2,rep,name=effectiveMembers"` + EffectiveIPBlocks []IPNet `json:"effectiveIPBlocks" protobuf:"bytes,3,rep,name=effectiveIPBlocks"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go b/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go index f9ce3b08c18..4dbc3b19a03 100644 --- a/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go +++ b/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go @@ -469,6 +469,7 @@ func Convert_controlplane_AppliedToGroupPatch_To_v1beta2_AppliedToGroupPatch(in func autoConvert_v1beta2_ClusterGroupMembers_To_controlplane_ClusterGroupMembers(in *ClusterGroupMembers, out *controlplane.ClusterGroupMembers, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta out.EffectiveMembers = *(*[]controlplane.GroupMember)(unsafe.Pointer(&in.EffectiveMembers)) + out.EffectiveIPBlocks = *(*[]controlplane.IPNet)(unsafe.Pointer(&in.EffectiveIPBlocks)) return nil } @@ -480,6 +481,7 @@ func Convert_v1beta2_ClusterGroupMembers_To_controlplane_ClusterGroupMembers(in func autoConvert_controlplane_ClusterGroupMembers_To_v1beta2_ClusterGroupMembers(in *controlplane.ClusterGroupMembers, out *ClusterGroupMembers, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta out.EffectiveMembers = *(*[]GroupMember)(unsafe.Pointer(&in.EffectiveMembers)) + out.EffectiveIPBlocks = *(*[]IPNet)(unsafe.Pointer(&in.EffectiveIPBlocks)) return nil } diff --git a/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go b/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go index efaa1562549..a7e6fdc2572 100644 --- a/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go +++ b/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go @@ -249,6 +249,13 @@ func (in *ClusterGroupMembers) DeepCopyInto(out *ClusterGroupMembers) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.EffectiveIPBlocks != nil { + in, out := &in.EffectiveIPBlocks, &out.EffectiveIPBlocks + *out = make([]IPNet, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } return } diff --git a/pkg/apis/controlplane/zz_generated.deepcopy.go b/pkg/apis/controlplane/zz_generated.deepcopy.go index 774a60b2381..fc3fa755fb4 100644 --- a/pkg/apis/controlplane/zz_generated.deepcopy.go +++ b/pkg/apis/controlplane/zz_generated.deepcopy.go @@ -249,6 +249,13 @@ func (in *ClusterGroupMembers) DeepCopyInto(out *ClusterGroupMembers) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.EffectiveIPBlocks != nil { + in, out := &in.EffectiveIPBlocks, &out.EffectiveIPBlocks + *out = make([]IPNet, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } return } diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go index 9a71290ba14..dc8651978b8 100644 --- a/pkg/apiserver/openapi/zz_generated.openapi.go +++ b/pkg/apiserver/openapi/zz_generated.openapi.go @@ -1783,7 +1783,7 @@ func schema_pkg_apis_controlplane_v1beta2_ClusterGroupMembers(ref common.Referen return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "ClusterGroupMembers is a list of GroupMember objects that are currently selected by a ClusterGroup.", + Description: "ClusterGroupMembers is a list of GroupMember objects or ipBlocks that are currently selected by a ClusterGroup.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { @@ -1819,12 +1819,25 @@ func schema_pkg_apis_controlplane_v1beta2_ClusterGroupMembers(ref common.Referen }, }, }, + "effectiveIPBlocks": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("antrea.io/antrea/pkg/apis/controlplane/v1beta2.IPNet"), + }, + }, + }, + }, + }, }, - Required: []string{"effectiveMembers"}, + Required: []string{"effectiveMembers", "effectiveIPBlocks"}, }, }, Dependencies: []string{ - "antrea.io/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "antrea.io/antrea/pkg/apis/controlplane/v1beta2.GroupMember", "antrea.io/antrea/pkg/apis/controlplane/v1beta2.IPNet", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } diff --git a/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest.go b/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest.go index 7287442dcac..6fe875ffe0e 100644 --- a/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest.go +++ b/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest.go @@ -41,7 +41,7 @@ func NewREST(querier groupMembershipQuerier) *REST { } type groupMembershipQuerier interface { - GetGroupMembers(name string) (controlplane.GroupMemberSet, error) + GetGroupMembers(name string) (interface{}, error) } func (r *REST) New() runtime.Object { @@ -49,16 +49,25 @@ func (r *REST) New() runtime.Object { } func (r *REST) Get(ctx context.Context, name string, options *metav1.GetOptions) (runtime.Object, error) { - members, err := r.querier.GetGroupMembers(name) + m, err := r.querier.GetGroupMembers(name) if err != nil { return nil, errors.NewInternalError(err) } - effectiveMembers := make([]controlplane.GroupMember, 0, len(members)) - for _, member := range members { - effectiveMembers = append(effectiveMembers, *member) - } - memberList := &controlplane.ClusterGroupMembers{ - EffectiveMembers: effectiveMembers, + memberList := &controlplane.ClusterGroupMembers{} + switch members := m.(type) { + case controlplane.GroupMemberSet: + effectiveMembers := make([]controlplane.GroupMember, 0, len(members)) + for _, member := range members { + effectiveMembers = append(effectiveMembers, *member) + } + memberList.EffectiveMembers = effectiveMembers + case []controlplane.IPBlock: + effectiveIPBlocks := make([]controlplane.IPNet, 0, len(members)) + for _, member := range members { + // ClusterGroup ipBlock cannot have except slices + effectiveIPBlocks = append(effectiveIPBlocks, member.CIDR) + } + memberList.EffectiveIPBlocks = effectiveIPBlocks } memberList.Name = name return memberList, nil diff --git a/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest_test.go b/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest_test.go index 558c39a43e3..96559b3d3da 100644 --- a/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest_test.go +++ b/pkg/apiserver/registry/networkpolicy/clustergroupmember/rest_test.go @@ -30,7 +30,7 @@ type fakeQuerier struct { members map[string]controlplane.GroupMemberSet } -func (q fakeQuerier) GetGroupMembers(uid string) (controlplane.GroupMemberSet, error) { +func (q fakeQuerier) GetGroupMembers(uid string) (interface{}, error) { if memberList, ok := q.members[uid]; ok { return memberList, nil } diff --git a/pkg/controller/networkpolicy/clustergroup.go b/pkg/controller/networkpolicy/clustergroup.go index 1f532ce2341..0bbe46b6e04 100644 --- a/pkg/controller/networkpolicy/clustergroup.go +++ b/pkg/controller/networkpolicy/clustergroup.go @@ -66,10 +66,10 @@ func (n *NetworkPolicyController) updateClusterGroup(oldObj, curObj interface{}) ipBlocksUpdated := func() bool { oldIPBs, newIPBs := sets.String{}, sets.String{} for _, ipb := range oldGroup.IPBlocks { - oldIPBs.Insert(ipNetToCIDRStr(ipb.CIDR)) + oldIPBs.Insert(ipb.CIDR.String()) } for _, ipb := range newGroup.IPBlocks { - newIPBs.Insert(ipNetToCIDRStr(ipb.CIDR)) + newIPBs.Insert(ipb.CIDR.String()) } return oldIPBs.Equal(newIPBs) } @@ -427,11 +427,16 @@ func (n *NetworkPolicyController) getAssociatedGroupsByName(grpName string) []an } // GetGroupMembers returns the current members of a ClusterGroup. -func (n *NetworkPolicyController) GetGroupMembers(cgName string) (controlplane.GroupMemberSet, error) { +// If the ClusterGroup is defined by IPBlocks, the returned members will be []controlplane.IPBlock. +// Otherwise, the returned members will be of type controlplane.GroupMemberSet. +func (n *NetworkPolicyController) GetGroupMembers(cgName string) (interface{}, error) { groupObj, found, _ := n.internalGroupStore.Get(cgName) if found { group := groupObj.(*antreatypes.Group) + if len(group.IPBlocks) > 0 { + return group.IPBlocks, nil + } return n.getClusterGroupMemberSet(group), nil } - return controlplane.GroupMemberSet{}, fmt.Errorf("no internal Group with name %s is found", cgName) + return nil, fmt.Errorf("no internal Group with name %s is found", cgName) } diff --git a/pkg/controller/networkpolicy/networkpolicy_controller.go b/pkg/controller/networkpolicy/networkpolicy_controller.go index e270876596b..3096ba2a615 100644 --- a/pkg/controller/networkpolicy/networkpolicy_controller.go +++ b/pkg/controller/networkpolicy/networkpolicy_controller.go @@ -1426,11 +1426,6 @@ func cidrStrToIPNet(cidr string) (*controlplane.IPNet, error) { return ipNet, nil } -// ipNetToCIDRStr returns the CIDR notation of a controlplane.IPNet. -func ipNetToCIDRStr(ipNet controlplane.IPNet) string { - return net.IP(ipNet.IP).String() + "/" + strconv.Itoa(int(ipNet.PrefixLength)) -} - // internalNetworkPolicyKeyFunc knows how to generate the key for an internal NetworkPolicy based on the object metadata // of the corresponding original NetworkPolicy resource (also referred to as the "source"). // The key must be unique across K8s NetworkPolicies, Antrea NetworkPolicies, and Antrea ClusterNetworkPolicies. diff --git a/pkg/controller/networkpolicy/networkpolicy_controller_test.go b/pkg/controller/networkpolicy/networkpolicy_controller_test.go index 9f3e4a8a2fd..a3c7433512b 100644 --- a/pkg/controller/networkpolicy/networkpolicy_controller_test.go +++ b/pkg/controller/networkpolicy/networkpolicy_controller_test.go @@ -1434,7 +1434,8 @@ func TestAddPod(t *testing.T) { updatedInAddrGroup := updatedInAddrGroupObj.(*antreatypes.AddressGroup) updatedOutAddrGroupObj, _, _ := npc.addressGroupStore.Get(outGroupID) updatedOutAddrGroup := updatedOutAddrGroupObj.(*antreatypes.AddressGroup) - groupMembers, _ := npc.GetGroupMembers(groupKey) + gm, _ := npc.GetGroupMembers(groupKey) + groupMembers, _ := gm.(controlplane.GroupMemberSet) if tt.appGroupMatch { assert.Len(t, podsAdded, 1, "expected Pod to match AppliedToGroup") } else { @@ -1532,7 +1533,8 @@ func TestDeletePod(t *testing.T) { updatedAddrGroup := updatedAddrGroupObj.(*antreatypes.AddressGroup) // Ensure Pod2 IP is removed from AddressGroup. memberPod2 := &controlplane.GroupMember{IPs: []controlplane.IPAddress{ipStrToIPAddress(p2IP)}} - groupMembers, _ := npc.GetGroupMembers(groupKey) + gm, _ := npc.GetGroupMembers(groupKey) + groupMembers, _ := gm.(controlplane.GroupMemberSet) assert.False(t, updatedAddrGroup.GroupMembers.Has(memberPod2)) assert.False(t, groupMembers.Has(memberPod2)) } @@ -1676,7 +1678,8 @@ func TestAddNamespace(t *testing.T) { updatedInAddrGroup := updatedInAddrGroupObj.(*antreatypes.AddressGroup) updatedOutAddrGroupObj, _, _ := npc.addressGroupStore.Get(outGroupID) updatedOutAddrGroup := updatedOutAddrGroupObj.(*antreatypes.AddressGroup) - groupMembers, _ := npc.GetGroupMembers(groupKey) + gm, _ := npc.GetGroupMembers(groupKey) + groupMembers, _ := gm.(controlplane.GroupMemberSet) memberPod1 := &controlplane.GroupMember{ Pod: &controlplane.PodReference{Name: "p1", Namespace: "nsA"}, IPs: []controlplane.IPAddress{ipStrToIPAddress("1.2.3.4")}, @@ -1839,7 +1842,8 @@ func TestDeleteNamespace(t *testing.T) { updatedInAddrGroup := updatedInAddrGroupObj.(*antreatypes.AddressGroup) updatedOutAddrGroupObj, _, _ := npc.addressGroupStore.Get(outGroupID) updatedOutAddrGroup := updatedOutAddrGroupObj.(*antreatypes.AddressGroup) - groupMembers, _ := npc.GetGroupMembers(groupKey) + gm, _ := npc.GetGroupMembers(groupKey) + groupMembers, _ := gm.(controlplane.GroupMemberSet) memberPod1 := &controlplane.GroupMember{IPs: []controlplane.IPAddress{ipStrToIPAddress("1.1.1.1")}} memberPod2 := &controlplane.GroupMember{IPs: []controlplane.IPAddress{ipStrToIPAddress("1.1.1.2")}} if tt.inAddressGroupMatch { @@ -1969,16 +1973,19 @@ func TestAddAndUpdateService(t *testing.T) { }, IPs: []controlplane.IPAddress{ipStrToIPAddress("4.3.2.1")}, } - groupMembers1, _ := npc.GetGroupMembers(testCG1.Name) + gm1, _ := npc.GetGroupMembers(testCG1.Name) + groupMembers1, _ := gm1.(controlplane.GroupMemberSet) assert.True(t, groupMembers1.Has(memberPod1)) assert.False(t, groupMembers1.Has(memberPod2)) - groupMembers2, _ := npc.GetGroupMembers(testCG2.Name) + gm2, _ := npc.GetGroupMembers(testCG2.Name) + groupMembers2, _ := gm2.(controlplane.GroupMemberSet) assert.False(t, groupMembers2.Has(memberPod1)) assert.False(t, groupMembers2.Has(memberPod2)) // Update svc-1 to select app test-2 instead npc.serviceStore.Update(testSvc1Updated) npc.syncInternalGroup(testCG1.Name) - groupMembers1Updated, _ := npc.GetGroupMembers(testCG1.Name) + gmu, _ := npc.GetGroupMembers(testCG1.Name) + groupMembers1Updated, _ := gmu.(controlplane.GroupMemberSet) assert.False(t, groupMembers1Updated.Has(memberPod1)) assert.True(t, groupMembers1Updated.Has(memberPod2)) } @@ -2036,12 +2043,14 @@ func TestDeleteService(t *testing.T) { }, IPs: []controlplane.IPAddress{ipStrToIPAddress("1.2.3.4")}, } - groupMembers, _ := npc.GetGroupMembers(testCG.Name) + gm, _ := npc.GetGroupMembers(testCG.Name) + groupMembers, _ := gm.(controlplane.GroupMemberSet) assert.True(t, groupMembers.Has(memberPod)) // Make sure that after Service deletion, the Pod member is removed from Group. npc.serviceStore.Delete(testSvc) npc.syncInternalGroup(testCG.Name) - groupMembersUpdated, _ := npc.GetGroupMembers(testCG.Name) + gmu, _ := npc.GetGroupMembers(testCG.Name) + groupMembersUpdated, _ := gmu.(controlplane.GroupMemberSet) assert.False(t, groupMembersUpdated.Has(memberPod)) } @@ -2940,7 +2949,7 @@ func TestIPNetToCIDRStr(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - assert.Equal(t, tt.expC, ipNetToCIDRStr(tt.inC)) + assert.Equal(t, tt.expC, tt.inC.String()) }) } }