From 7ec9bd311bbba44f90792e4c7811ad42c98051f6 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 30 Mar 2022 14:51:21 +0200 Subject: [PATCH] go.mod, vendor: update cilium to v1.11.3 Signed-off-by: Tobias Klauser --- go.mod | 2 +- go.sum | 4 +- vendor/github.com/cilium/cilium/AUTHORS | 5 +- .../k8s/slim/k8s/api/core/v1/generated.pb.go | 293 ++++++++++-------- .../k8s/slim/k8s/api/core/v1/generated.proto | 6 + .../pkg/k8s/slim/k8s/api/core/v1/types.go | 5 + .../k8s/api/core/v1/zz_generated.deepequal.go | 3 + .../cilium/pkg/logging/logfields/logfields.go | 3 + .../cilium/cilium/pkg/option/config.go | 6 + vendor/modules.txt | 2 +- 10 files changed, 198 insertions(+), 131 deletions(-) diff --git a/go.mod b/go.mod index 9090033d1e..3dd2da88b6 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( require ( github.com/blang/semver/v4 v4.0.0 github.com/cilium/charts v0.0.0-20220328201227-74ca65b8ff86 - github.com/cilium/cilium v1.11.2 + github.com/cilium/cilium v1.11.3 github.com/cilium/hubble v0.9.0 github.com/cilium/workerpool v1.1.2 github.com/cloudflare/cfssl v1.6.1 diff --git a/go.sum b/go.sum index 6da1484e95..0ecf114f7f 100644 --- a/go.sum +++ b/go.sum @@ -280,8 +280,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cilium/charts v0.0.0-20220328201227-74ca65b8ff86 h1:59ypwFmkjHMClmwZueQa9jvozfu+epY2LHKVjd2d2fg= github.com/cilium/charts v0.0.0-20220328201227-74ca65b8ff86/go.mod h1:M3C9VOlFvRzuV+a01t07Tw4uFLSfkCH3L542IWjf6BU= -github.com/cilium/cilium v1.11.2 h1:lpCgoLqnPOryj4KikPADkQJSQIeuqt+ehetShRTWx6I= -github.com/cilium/cilium v1.11.2/go.mod h1:5//yZGCcUvOh+JlXk8ADfiLFTiVh92xzAn9t/5bpjj4= +github.com/cilium/cilium v1.11.3 h1:ryoQH2SXtgXVG8wpUPJJPpxNPXz2JPx1QoxGfcHH818= +github.com/cilium/cilium v1.11.3/go.mod h1:5//yZGCcUvOh+JlXk8ADfiLFTiVh92xzAn9t/5bpjj4= github.com/cilium/dns v1.1.4-0.20190417235132-8e25ec9a0ff3/go.mod h1:cXN7jgo+gsGlNvQ7Vqu2ELdc3f7i7PPgupHqSkLzzBo= github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= diff --git a/vendor/github.com/cilium/cilium/AUTHORS b/vendor/github.com/cilium/cilium/AUTHORS index 4ace13173b..b46d0b1c2c 100644 --- a/vendor/github.com/cilium/cilium/AUTHORS +++ b/vendor/github.com/cilium/cilium/AUTHORS @@ -2,7 +2,7 @@ The following people, in alphabetical order, have either authored or signed off on commits in the Cilium repository: Àbéjídé Àyodélé abejideayodele@gmail.com -Adam Bocim adam.bocim@firma.seznam.cz +Adam Bocim adam.bocim@seznam.cz Adam Korcz adam@adalogics.com Adam Wolfe Gordon awg@digitalocean.com adamzhoul adamzhoul186@gmail.com @@ -227,6 +227,7 @@ Maxime Visonneau maxime.visonneau@gmail.com Maximilian Bischoff maximilian.bischoff@inovex.de Maximilian Mack max@mack.io Melissa Peiffer mbp83@nau.edu +Michael Fischer fiscmi@amazon.com Michael Fornaro 20387402+xUnholy@users.noreply.github.com Michael Kashin mmkashin@gmail.com Michael Petrov michael@openai.com @@ -249,6 +250,7 @@ Neil Wilson neil@aldur.co.uk Nick M 4718+rkage@users.noreply.github.com Nicolas Busseneau nicolas@isovalent.com Nirmoy Das ndas@suse.de +Nitish Malhotra nitishm@microsoft.com Ole Markus With o.with@sportradar.com Ondrej Blazek ondrej.blazek@firma.seznam.cz Patrice Peterson patrice.peterson@mailbox.org @@ -288,6 +290,7 @@ Ryan McNamara rmcnamara@palantir.com Saikrishna Edupuganti saikrishna.edupuganti@intel.com Salvatore Mazzarino salvatore@accuknox.com Sami Yessou fnzv@users.noreply.github.com +Samuel Torres samuelpirestorres@gmail.com Sander Timmerman stimmerman@schubergphilis.com Sarvesh Rangnekar sarveshr@google.com Scott Albertson ascottalbertson@gmail.com diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.pb.go b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.pb.go index 612c10ed02..54b4bd9be5 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.pb.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.pb.go @@ -970,136 +970,137 @@ func init() { } var fileDescriptor_871504499faea14d = []byte{ - // 2057 bytes of a gzipped FileDescriptorProto + // 2068 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0x23, 0x49, 0x15, 0x4f, 0xdb, 0x71, 0x12, 0x3f, 0x3b, 0xce, 0x50, 0x99, 0x41, 0xbd, 0x61, 0xd7, 0x09, 0x3d, 0x12, 0x0a, 0x68, 0xb1, 0x95, 0x81, 0x41, 0xc3, 0xcc, 0x6a, 0x98, 0x38, 0x93, 0xd1, 0x78, 0x49, 0x86, 0x56, 0x39, 0x5a, 0x10, 0x17, 0xb6, 0xd3, 0x5d, 0xb1, 0x9b, 0xb8, 0xbb, 0x5a, 0x5d, 0xe5, - 0x0c, 0x96, 0x10, 0x2c, 0x42, 0x48, 0x8b, 0xd8, 0x03, 0x17, 0x8e, 0xfc, 0x21, 0x88, 0xf3, 0x4a, - 0x73, 0x5c, 0xc4, 0x65, 0x84, 0x50, 0xc4, 0x18, 0x89, 0x1b, 0x07, 0xc4, 0x2d, 0x07, 0x84, 0xaa, - 0xba, 0xfa, 0xcb, 0xb1, 0x67, 0x67, 0xec, 0x91, 0xa2, 0x3d, 0xb9, 0xeb, 0xd5, 0xab, 0xf7, 0x7b, - 0xef, 0xd5, 0xfb, 0xa8, 0x2a, 0xc3, 0x7e, 0xd7, 0xe5, 0xbd, 0xc1, 0x71, 0xc3, 0xa6, 0x5e, 0xd3, - 0x76, 0xfb, 0xee, 0x20, 0xf9, 0x09, 0x4e, 0xbb, 0xcd, 0xd3, 0x3b, 0xac, 0xc9, 0xfa, 0xae, 0x27, - 0x3f, 0xac, 0xc0, 0x6d, 0xda, 0x34, 0x24, 0xcd, 0xb3, 0x9d, 0x66, 0x97, 0xf8, 0x24, 0xb4, 0x38, - 0x71, 0x1a, 0x41, 0x48, 0x39, 0x45, 0xb7, 0x53, 0x31, 0x8d, 0x68, 0x7d, 0xfc, 0x13, 0x9c, 0x76, - 0x1b, 0xa7, 0x77, 0x58, 0x43, 0x88, 0x91, 0x1f, 0x56, 0xe0, 0x36, 0x84, 0x98, 0xc6, 0xd9, 0xce, - 0xc6, 0xa3, 0xd7, 0x42, 0x67, 0x4d, 0x8f, 0x70, 0x6b, 0x02, 0xfc, 0xc6, 0x37, 0x33, 0x72, 0xba, - 0xb4, 0x4b, 0x9b, 0x92, 0x7c, 0x3c, 0x38, 0x91, 0x23, 0x39, 0x90, 0x5f, 0x8a, 0x5d, 0x08, 0x6c, - 0xb8, 0x54, 0xc8, 0xf4, 0x2c, 0xbb, 0xe7, 0xfa, 0x24, 0x1c, 0x4a, 0xc4, 0x70, 0xe0, 0x73, 0xd7, - 0x23, 0x97, 0xe4, 0x7f, 0xe7, 0xf3, 0x16, 0x30, 0xbb, 0x47, 0x3c, 0x6b, 0x7c, 0x9d, 0x71, 0x00, - 0xb5, 0xbd, 0xbe, 0x4b, 0x7c, 0xde, 0x36, 0xf7, 0xa8, 0x7f, 0xe2, 0x76, 0xd1, 0x5d, 0xa8, 0x89, - 0x05, 0x74, 0xc0, 0x3b, 0xc4, 0xa6, 0xbe, 0xc3, 0x74, 0x6d, 0x4b, 0xdb, 0x2e, 0xb5, 0xd0, 0xe8, - 0x7c, 0xb3, 0x76, 0x94, 0x9b, 0xc1, 0x63, 0x9c, 0xc6, 0x9f, 0x0b, 0x50, 0xde, 0xa3, 0x3e, 0xb7, - 0x04, 0x3e, 0xda, 0x82, 0x45, 0xdf, 0xf2, 0x88, 0x5c, 0x5f, 0x6e, 0x55, 0x9f, 0x9d, 0x6f, 0x2e, - 0x8c, 0xce, 0x37, 0x17, 0x9f, 0x58, 0x1e, 0xc1, 0x72, 0x06, 0xdd, 0x84, 0x92, 0xeb, 0x59, 0x5d, - 0xa2, 0x17, 0x24, 0xcb, 0xaa, 0x62, 0x29, 0xb5, 0x05, 0x11, 0x47, 0x73, 0xc8, 0x85, 0x52, 0x40, - 0x43, 0xce, 0xf4, 0xa5, 0xad, 0xe2, 0x76, 0xe5, 0xd6, 0xc3, 0xc6, 0x4c, 0x3b, 0xd9, 0x48, 0xf4, - 0x32, 0x69, 0xc8, 0x53, 0x28, 0x31, 0x62, 0x38, 0x42, 0x40, 0x3f, 0x87, 0xea, 0x19, 0xed, 0x0f, - 0x3c, 0x72, 0x48, 0x07, 0x3e, 0x67, 0x7a, 0x59, 0x22, 0xb6, 0x66, 0x44, 0xfc, 0x20, 0x15, 0xd5, - 0xba, 0xae, 0xf0, 0xaa, 0x19, 0x22, 0xc3, 0x39, 0x34, 0xe3, 0x7f, 0x1a, 0xac, 0xe6, 0xb4, 0x7c, - 0x05, 0x0f, 0xbe, 0x0b, 0x2b, 0x3d, 0xca, 0xb8, 0xe0, 0x96, 0x4e, 0x2c, 0xb5, 0xae, 0x29, 0xae, - 0x95, 0xc7, 0x8a, 0x8e, 0x13, 0x0e, 0x74, 0x0f, 0x56, 0xed, 0x2c, 0x80, 0x5e, 0x94, 0x4b, 0x6e, - 0xa8, 0x25, 0x79, 0x74, 0x9c, 0xe7, 0x45, 0x77, 0x60, 0x45, 0xc6, 0x8c, 0x4d, 0xfb, 0xfa, 0xa2, - 0x54, 0xe8, 0xed, 0x18, 0xca, 0x54, 0xf4, 0x8b, 0xcc, 0x37, 0x4e, 0xb8, 0xd1, 0xd7, 0x60, 0x49, - 0xa8, 0xd0, 0x36, 0xf5, 0x92, 0x5c, 0x57, 0x53, 0xeb, 0x96, 0x1e, 0x4b, 0x2a, 0x56, 0xb3, 0xc6, - 0x0f, 0x61, 0x6d, 0xdf, 0x77, 0x02, 0xea, 0xfa, 0x7c, 0xd7, 0x71, 0x42, 0xc2, 0x18, 0xda, 0x80, - 0x82, 0x1b, 0x28, 0xfb, 0x41, 0x2d, 0x2b, 0xb4, 0x4d, 0x5c, 0x70, 0x03, 0xb4, 0x0d, 0x2b, 0x3e, - 0x75, 0x88, 0xf0, 0x86, 0x52, 0xa8, 0x2a, 0x94, 0x79, 0xa2, 0x68, 0x38, 0x99, 0x35, 0x3e, 0xd1, - 0xa0, 0x1a, 0x4b, 0x7e, 0x45, 0xc7, 0x6e, 0xc1, 0x62, 0x90, 0x3a, 0x35, 0xe1, 0x90, 0x8e, 0x91, - 0x33, 0x39, 0x7f, 0x14, 0x5f, 0xc7, 0x1f, 0xc6, 0x7f, 0x35, 0xa8, 0xc5, 0xea, 0x74, 0x06, 0xc7, - 0x8c, 0x70, 0xf4, 0x14, 0xca, 0x56, 0x64, 0x32, 0x11, 0x09, 0x27, 0xc2, 0xee, 0xd1, 0x8c, 0x61, - 0x37, 0xe6, 0xc2, 0xd6, 0x97, 0x94, 0x56, 0xe5, 0xdd, 0x18, 0x00, 0xa7, 0x58, 0xa8, 0x17, 0x67, - 0x57, 0x51, 0x82, 0xee, 0xcd, 0x09, 0x3a, 0x3d, 0xb9, 0x8c, 0xff, 0x68, 0x50, 0x8e, 0xd9, 0x18, - 0x0a, 0x61, 0x45, 0xd4, 0x4a, 0xc7, 0xe2, 0x96, 0xdc, 0x85, 0xd7, 0x4e, 0x33, 0xd6, 0x10, 0xeb, - 0x05, 0xf6, 0x0f, 0x8e, 0x7f, 0x4a, 0x6c, 0x7e, 0x48, 0xb8, 0xd5, 0x42, 0x0a, 0x19, 0x52, 0x1a, - 0x4e, 0x70, 0x50, 0x00, 0xcb, 0x4c, 0xba, 0x9b, 0xe9, 0x05, 0x69, 0xed, 0xfe, 0x9c, 0xd6, 0x46, - 0x9b, 0xd7, 0x5a, 0x53, 0xa8, 0xcb, 0xd1, 0x98, 0xe1, 0x18, 0xc6, 0xf8, 0x97, 0x06, 0xab, 0x89, - 0xcd, 0x07, 0x2e, 0xe3, 0xc8, 0xbf, 0x64, 0xf7, 0x83, 0x59, 0xed, 0x16, 0xf2, 0xa4, 0xd5, 0x49, - 0xca, 0xc7, 0x94, 0x8c, 0xcd, 0x04, 0x4a, 0x2e, 0x27, 0x5e, 0x6c, 0xf1, 0x83, 0x39, 0x2d, 0x66, - 0x99, 0x22, 0x2d, 0xc4, 0xe2, 0x48, 0xba, 0xf1, 0x5b, 0x0d, 0xd6, 0xf7, 0x83, 0x1e, 0xf1, 0x48, - 0x68, 0xf5, 0x93, 0x32, 0x72, 0x25, 0xdb, 0x6c, 0xec, 0xc0, 0xfa, 0x01, 0xb5, 0x9c, 0x96, 0xd5, - 0xb7, 0x7c, 0x9b, 0x84, 0x6d, 0xbf, 0xfb, 0x79, 0xa5, 0xc4, 0xf8, 0x9d, 0x06, 0x28, 0xbb, 0xa6, - 0xc3, 0x2d, 0x3e, 0x60, 0x68, 0x00, 0xcb, 0x6e, 0xb4, 0x5a, 0xe5, 0xe4, 0xfb, 0x33, 0xba, 0x6f, - 0x82, 0x3e, 0x69, 0xd4, 0x28, 0x02, 0x8e, 0xb1, 0x8c, 0x5f, 0x42, 0x59, 0x54, 0x22, 0x16, 0x58, - 0x36, 0xb9, 0x12, 0x0f, 0x8a, 0xb0, 0x4d, 0x34, 0xf8, 0x22, 0x87, 0x6d, 0x62, 0xc4, 0x94, 0xb0, - 0x7d, 0x56, 0x80, 0x45, 0xd1, 0x2f, 0xae, 0xa4, 0x1c, 0x59, 0xb0, 0xc8, 0x02, 0x62, 0xcb, 0x16, - 0x53, 0xb9, 0xf5, 0xbd, 0x59, 0x4d, 0xa4, 0x0e, 0xe9, 0x04, 0xc4, 0x4e, 0x7b, 0x94, 0x18, 0x61, - 0x29, 0x1a, 0xb9, 0xb0, 0xc4, 0x64, 0x28, 0xcb, 0x0e, 0x55, 0xb9, 0xb5, 0x3b, 0x0f, 0x88, 0x14, - 0x94, 0x36, 0xef, 0x68, 0x8c, 0x15, 0x80, 0xe1, 0x41, 0x45, 0x70, 0xc5, 0x8d, 0xfb, 0x5b, 0xb0, - 0xc8, 0x87, 0x41, 0xdc, 0x61, 0x37, 0x63, 0xdd, 0x8e, 0x86, 0x01, 0xb9, 0x38, 0xdf, 0x5c, 0xcb, - 0xb0, 0x0a, 0x12, 0x96, 0xcc, 0xe8, 0xeb, 0xb0, 0xac, 0x3a, 0x93, 0x3a, 0x11, 0x26, 0x39, 0xa2, - 0x78, 0x71, 0x3c, 0x6f, 0xfc, 0x5d, 0x03, 0xd9, 0xe9, 0xaf, 0x24, 0x3a, 0x3f, 0xcc, 0x47, 0xe7, - 0xbd, 0x39, 0xbc, 0x3a, 0x25, 0x30, 0x3f, 0x55, 0xe6, 0x89, 0xbd, 0x14, 0x6e, 0x09, 0xa8, 0xb3, - 0xd7, 0x7e, 0x88, 0x95, 0x3b, 0x13, 0xb7, 0x98, 0x11, 0x19, 0xc7, 0xf3, 0xe2, 0x4c, 0xa4, 0x3e, - 0x99, 0xbe, 0xbc, 0x55, 0x8c, 0xcf, 0x44, 0x8a, 0x8f, 0xe1, 0x64, 0x16, 0x39, 0xb0, 0x24, 0x8a, - 0x34, 0x67, 0x7a, 0x49, 0x1a, 0xf1, 0xde, 0x8c, 0x46, 0x1c, 0x09, 0x21, 0x69, 0x54, 0xc8, 0x21, - 0xc3, 0x4a, 0xb6, 0xf1, 0x2b, 0x0d, 0x20, 0x0d, 0x1e, 0xc4, 0xb2, 0xc7, 0x9c, 0xd2, 0x5c, 0xa7, - 0xeb, 0x4c, 0x04, 0xbd, 0xfc, 0x88, 0x63, 0x7c, 0x5a, 0x80, 0xa2, 0x49, 0x9d, 0x2b, 0xc9, 0xf1, - 0x0f, 0x73, 0x39, 0x7e, 0x7f, 0x46, 0x5b, 0x4d, 0xea, 0x4c, 0x4d, 0xf1, 0xde, 0x58, 0x8a, 0x3f, - 0x98, 0x03, 0xe3, 0xe5, 0x19, 0xfe, 0xbc, 0x08, 0x55, 0x11, 0x48, 0xd4, 0x77, 0x5c, 0xee, 0x52, - 0x1f, 0x7d, 0x3b, 0x97, 0xe3, 0x5b, 0x63, 0x39, 0x7e, 0x2d, 0xcb, 0x9b, 0x49, 0xf2, 0xef, 0x26, - 0x0a, 0x47, 0x39, 0xfe, 0xd5, 0x3c, 0x9c, 0xa8, 0x0e, 0xc9, 0xb2, 0xbc, 0x06, 0x68, 0x08, 0xab, - 0x7d, 0x8b, 0x71, 0x33, 0xa4, 0xc7, 0x44, 0x5c, 0x45, 0x95, 0xc9, 0xef, 0xcd, 0xba, 0x8d, 0x42, - 0x46, 0x7a, 0xfb, 0x39, 0xc8, 0x8a, 0xc6, 0x79, 0x24, 0xf4, 0xb1, 0x06, 0x48, 0x50, 0x8e, 0x42, - 0xcb, 0x67, 0x91, 0x49, 0xae, 0xba, 0x77, 0xcc, 0xab, 0xc0, 0x86, 0x52, 0x00, 0x1d, 0x5c, 0x92, - 0x8f, 0x27, 0x60, 0x8a, 0xeb, 0x54, 0x48, 0x2c, 0x46, 0xfd, 0xf1, 0xeb, 0x14, 0x96, 0x54, 0xac, - 0x66, 0x45, 0xd9, 0xf0, 0x08, 0x63, 0xe2, 0x7e, 0xbd, 0x94, 0x2f, 0x1b, 0x87, 0x11, 0x19, 0xc7, - 0xf3, 0xc6, 0x4d, 0x28, 0x99, 0xd4, 0x69, 0x9b, 0x2f, 0x3d, 0x24, 0xfd, 0x4d, 0x03, 0x51, 0x70, - 0xae, 0xa4, 0xe2, 0xfe, 0x24, 0x5f, 0x71, 0xef, 0xce, 0x1e, 0xe4, 0x53, 0x0a, 0xee, 0x6f, 0x8a, - 0xd2, 0x38, 0x59, 0x6f, 0x3f, 0xd2, 0xa0, 0xe6, 0xfa, 0x2e, 0x4f, 0xcf, 0xb1, 0xfa, 0xf5, 0xb9, - 0x8e, 0x21, 0x89, 0xa0, 0xd6, 0x97, 0x15, 0x78, 0xad, 0x9d, 0x93, 0x8f, 0xc7, 0xf0, 0x10, 0x07, - 0xb0, 0x53, 0xf4, 0xc2, 0x1b, 0x42, 0x4f, 0x6a, 0x55, 0x06, 0x39, 0x83, 0x83, 0xde, 0x07, 0xc4, - 0x48, 0x78, 0xe6, 0xda, 0x64, 0xd7, 0xb6, 0xe9, 0xc0, 0xe7, 0xf2, 0x6e, 0xbd, 0x22, 0xa3, 0x21, - 0x89, 0xd2, 0xce, 0x25, 0x0e, 0x3c, 0x61, 0x15, 0xba, 0x0d, 0x15, 0x71, 0xad, 0x7f, 0x42, 0xf8, - 0x53, 0x1a, 0x9e, 0xea, 0x95, 0x2d, 0x6d, 0x7b, 0xa5, 0xb5, 0xae, 0x84, 0x54, 0x1e, 0xa7, 0x53, - 0x38, 0xcb, 0x67, 0xfc, 0xb5, 0x08, 0xe5, 0xa4, 0x14, 0xa1, 0x26, 0x94, 0x82, 0x9e, 0xc5, 0xe2, - 0x12, 0xf3, 0x56, 0x72, 0xb1, 0x14, 0xc4, 0x8b, 0xa8, 0xb1, 0xc9, 0x6f, 0x1c, 0xf1, 0xa1, 0xa7, - 0xd2, 0x6f, 0x51, 0xf1, 0x88, 0xfd, 0xb6, 0x37, 0x7b, 0xb0, 0x24, 0x85, 0x28, 0xe7, 0x3a, 0x25, - 0x1e, 0x67, 0xa0, 0x5e, 0xf5, 0x8d, 0x03, 0xdd, 0x14, 0xf7, 0x6d, 0xa7, 0x6d, 0xaa, 0x94, 0xcc, - 0x5c, 0x95, 0x9d, 0xb6, 0x89, 0xa3, 0x39, 0xd1, 0x9b, 0xe5, 0x07, 0xd3, 0xab, 0x73, 0xf5, 0x66, - 0x29, 0x34, 0x55, 0x45, 0x0e, 0x19, 0x56, 0xb2, 0x91, 0x0b, 0x65, 0xc6, 0xad, 0x90, 0xcb, 0x42, - 0xb6, 0xfc, 0x06, 0x0a, 0xd9, 0xaa, 0x68, 0xc1, 0x9d, 0x58, 0x24, 0x4e, 0xa5, 0x1b, 0x7f, 0x29, - 0xc0, 0xb2, 0x8a, 0x9b, 0x2b, 0x69, 0xc3, 0x4e, 0xae, 0x0d, 0xcf, 0x7a, 0xe4, 0x50, 0x16, 0x4c, - 0x6d, 0xc5, 0xfd, 0xb1, 0x56, 0xfc, 0x70, 0x4e, 0x9c, 0x97, 0xb7, 0xe3, 0x91, 0x06, 0x15, 0xc5, - 0x79, 0x25, 0x25, 0xd9, 0xce, 0x97, 0xe4, 0xfb, 0xf3, 0x19, 0x3b, 0xa5, 0x2c, 0xff, 0x29, 0x35, - 0xf2, 0x15, 0x1f, 0xee, 0xb2, 0xcf, 0x72, 0x85, 0xd7, 0x7a, 0xa6, 0x8c, 0x9f, 0xfc, 0x8a, 0x53, - 0x9f, 0xfc, 0xde, 0x8d, 0x5e, 0x1c, 0xe5, 0xd3, 0x69, 0x29, 0xff, 0xda, 0xfa, 0x44, 0xd1, 0x71, - 0xc2, 0x61, 0x7c, 0x52, 0x4e, 0x74, 0x97, 0x6d, 0xa5, 0x1b, 0x3f, 0xb5, 0x69, 0x73, 0x1d, 0x7c, - 0x33, 0xee, 0x98, 0xf2, 0x8c, 0xfd, 0x0b, 0x58, 0x61, 0xa4, 0x4f, 0x6c, 0x4e, 0x43, 0xb5, 0x39, - 0xe6, 0xfc, 0x11, 0xdf, 0xe8, 0x28, 0x91, 0xfb, 0x3e, 0x0f, 0x87, 0xa9, 0xe1, 0x31, 0x19, 0x27, - 0x98, 0xa8, 0x09, 0x65, 0xbb, 0x3f, 0x60, 0x9c, 0x84, 0x6d, 0x53, 0x3d, 0x8d, 0x26, 0x27, 0xf4, - 0xbd, 0x78, 0x02, 0xa7, 0x3c, 0xa8, 0x01, 0x90, 0x0c, 0x98, 0x8e, 0xe4, 0xbd, 0xa5, 0x26, 0x8b, - 0x6d, 0x42, 0xc5, 0x19, 0x0e, 0xd4, 0x54, 0x07, 0xcf, 0xe8, 0xd5, 0xf7, 0x2b, 0x63, 0x07, 0xcf, - 0xd8, 0xe9, 0x99, 0x33, 0xe7, 0x0e, 0x54, 0xc8, 0xcf, 0x38, 0x09, 0x7d, 0xab, 0x2f, 0x10, 0x4a, - 0x12, 0x61, 0x4d, 0x34, 0xa2, 0xfd, 0x94, 0x8c, 0xb3, 0x3c, 0xe8, 0x08, 0xd6, 0x18, 0x61, 0xcc, - 0xa5, 0xfe, 0xee, 0xc9, 0x89, 0xe8, 0xce, 0x43, 0x59, 0x23, 0xcb, 0xad, 0x6f, 0x28, 0xb8, 0xb5, - 0x4e, 0x7e, 0xfa, 0x42, 0x92, 0xa2, 0x3e, 0xa8, 0x48, 0x78, 0x5c, 0x04, 0xba, 0x0f, 0xb5, 0x7e, - 0xf6, 0x2d, 0xc8, 0x54, 0xdd, 0x35, 0x39, 0x17, 0xe4, 0x5e, 0x8a, 0x4c, 0x3c, 0xc6, 0x8d, 0x7e, - 0x04, 0x7a, 0x96, 0xd2, 0xa1, 0x83, 0xd0, 0x26, 0xd8, 0xf2, 0xbb, 0x24, 0xfa, 0xb7, 0xa2, 0xdc, - 0x7a, 0x7b, 0x74, 0xbe, 0xa9, 0x1f, 0x4c, 0xe1, 0xc1, 0x53, 0x57, 0xa3, 0xa7, 0x70, 0x23, 0x36, - 0xff, 0x28, 0xb4, 0x4e, 0x4e, 0x5c, 0xdb, 0xa4, 0x7d, 0xd7, 0x1e, 0xca, 0xce, 0x5d, 0x6e, 0xed, - 0x2a, 0x05, 0x6f, 0xec, 0x4f, 0x62, 0xba, 0x38, 0xdf, 0xdc, 0x52, 0xb6, 0x4f, 0x9c, 0x97, 0x5b, - 0x31, 0x59, 0x3e, 0x3a, 0x84, 0xf5, 0x1e, 0xb1, 0xfa, 0xbc, 0xb7, 0xd7, 0x23, 0xf6, 0x69, 0x9c, - 0x47, 0x7a, 0x55, 0xe6, 0x57, 0xbc, 0xb7, 0xeb, 0x8f, 0x2f, 0xb3, 0xe0, 0x49, 0xeb, 0xd0, 0x1f, - 0x35, 0xb8, 0x31, 0xe6, 0xf5, 0xe8, 0x9f, 0x2d, 0xbd, 0x26, 0x8b, 0xe2, 0xc1, 0xcc, 0xa9, 0x30, - 0x41, 0x66, 0xeb, 0x2d, 0xe1, 0x92, 0x89, 0x53, 0x78, 0xb2, 0x16, 0xe8, 0x2e, 0x80, 0x1b, 0x3c, - 0xb2, 0x3c, 0xb7, 0xef, 0x12, 0xa6, 0xaf, 0xcb, 0x3d, 0xdb, 0x10, 0xb1, 0xde, 0x36, 0x63, 0xaa, - 0xa8, 0x4f, 0x6a, 0x34, 0xc4, 0x19, 0xee, 0x8d, 0x7b, 0xb0, 0x9a, 0xcb, 0x42, 0x74, 0x0d, 0x8a, - 0xa7, 0x64, 0x18, 0x55, 0x43, 0x2c, 0x3e, 0xd1, 0x75, 0x28, 0x9d, 0x59, 0xfd, 0x81, 0xfa, 0x4b, - 0x0d, 0x47, 0x83, 0xbb, 0x85, 0x3b, 0x9a, 0xf1, 0x07, 0x4d, 0xac, 0xce, 0x74, 0x16, 0xf4, 0x6b, - 0x0d, 0xaa, 0xd9, 0x78, 0x50, 0x6d, 0xa3, 0xfd, 0x06, 0x1e, 0x39, 0x55, 0xef, 0x4a, 0xfe, 0xf6, - 0xca, 0xce, 0xe1, 0x1c, 0xa8, 0xf1, 0xb1, 0x06, 0x93, 0x3d, 0x88, 0x28, 0xac, 0xd8, 0xea, 0xcf, - 0x49, 0xa5, 0xda, 0xac, 0x0f, 0xf6, 0xf9, 0xff, 0x38, 0xa3, 0x37, 0x91, 0x98, 0x86, 0x13, 0x10, - 0xe3, 0xdf, 0x1a, 0x94, 0xe4, 0x03, 0x06, 0x7a, 0x27, 0xe3, 0xd8, 0x56, 0x45, 0x59, 0x51, 0xfc, - 0x3e, 0x19, 0x46, 0x5e, 0xbe, 0x99, 0xf3, 0x72, 0x5a, 0x86, 0x3f, 0x10, 0x44, 0xe5, 0x74, 0x74, - 0x1b, 0x96, 0xc8, 0xc9, 0x09, 0xb1, 0xb9, 0xaa, 0x81, 0xef, 0xc4, 0x8d, 0x7c, 0x5f, 0x52, 0x45, - 0xa5, 0x92, 0x60, 0xd1, 0x10, 0x2b, 0x66, 0x71, 0x2c, 0xe3, 0xae, 0x47, 0x76, 0x1d, 0x87, 0x38, - 0x6f, 0xe4, 0x7e, 0x29, 0x8f, 0x65, 0x47, 0xb1, 0x48, 0x9c, 0x4a, 0x37, 0xee, 0x43, 0x25, 0xf3, - 0x7f, 0xa4, 0xa8, 0xdb, 0x9e, 0xf8, 0x30, 0x2d, 0xde, 0x1b, 0xaf, 0xdb, 0x87, 0xf1, 0x04, 0x4e, - 0x79, 0x5a, 0xdb, 0xcf, 0x5e, 0xd4, 0x17, 0x3e, 0x7b, 0x51, 0x5f, 0x78, 0xfe, 0xa2, 0xbe, 0xf0, - 0xd1, 0xa8, 0xae, 0x3d, 0x1b, 0xd5, 0xb5, 0xcf, 0x46, 0x75, 0xed, 0xf9, 0xa8, 0xae, 0xfd, 0x63, - 0x54, 0xd7, 0x7e, 0xff, 0xcf, 0xfa, 0xc2, 0x8f, 0x0b, 0x67, 0x3b, 0xff, 0x0f, 0x00, 0x00, 0xff, - 0xff, 0xdd, 0x3a, 0x66, 0x53, 0xc6, 0x1f, 0x00, 0x00, + 0x0c, 0x96, 0x10, 0x2c, 0xe2, 0xb2, 0x88, 0x3d, 0x70, 0xe1, 0xc8, 0x5f, 0xc1, 0x09, 0x71, 0x5e, + 0x69, 0x8e, 0x8b, 0xb8, 0x8c, 0x10, 0x8a, 0x18, 0x23, 0x71, 0xe3, 0x80, 0xb8, 0xe5, 0x80, 0x50, + 0x55, 0x57, 0x7f, 0x39, 0xf6, 0xec, 0x8c, 0x3d, 0x52, 0xb4, 0x27, 0x77, 0xbd, 0x7a, 0xf5, 0x7e, + 0xef, 0xbd, 0x7a, 0x1f, 0x55, 0x65, 0xd8, 0xef, 0xba, 0xbc, 0x37, 0x38, 0x6e, 0xd8, 0xd4, 0x6b, + 0xda, 0x6e, 0xdf, 0x1d, 0x24, 0x3f, 0xc1, 0x69, 0xb7, 0x79, 0x7a, 0x87, 0x35, 0x59, 0xdf, 0xf5, + 0xe4, 0x87, 0x15, 0xb8, 0x4d, 0x9b, 0x86, 0xa4, 0x79, 0xb6, 0xd3, 0xec, 0x12, 0x9f, 0x84, 0x16, + 0x27, 0x4e, 0x23, 0x08, 0x29, 0xa7, 0xe8, 0x76, 0x2a, 0xa6, 0x11, 0xad, 0x8f, 0x7f, 0x82, 0xd3, + 0x6e, 0xe3, 0xf4, 0x0e, 0x6b, 0x08, 0x31, 0xf2, 0xc3, 0x0a, 0xdc, 0x86, 0x10, 0xd3, 0x38, 0xdb, + 0xd9, 0x78, 0xf4, 0x5a, 0xe8, 0xac, 0xe9, 0x11, 0x6e, 0x4d, 0x80, 0xdf, 0xf8, 0x66, 0x46, 0x4e, + 0x97, 0x76, 0x69, 0x53, 0x92, 0x8f, 0x07, 0x27, 0x72, 0x24, 0x07, 0xf2, 0x4b, 0xb1, 0x0b, 0x81, + 0x0d, 0x97, 0x0a, 0x99, 0x9e, 0x65, 0xf7, 0x5c, 0x9f, 0x84, 0x43, 0x89, 0x18, 0x0e, 0x7c, 0xee, + 0x7a, 0xe4, 0x92, 0xfc, 0xef, 0x7c, 0xde, 0x02, 0x66, 0xf7, 0x88, 0x67, 0x8d, 0xaf, 0x33, 0x0e, + 0xa0, 0xb6, 0xd7, 0x77, 0x89, 0xcf, 0xdb, 0xe6, 0x1e, 0xf5, 0x4f, 0xdc, 0x2e, 0xba, 0x0b, 0x35, + 0xb1, 0x80, 0x0e, 0x78, 0x87, 0xd8, 0xd4, 0x77, 0x98, 0xae, 0x6d, 0x69, 0xdb, 0xa5, 0x16, 0x1a, + 0x9d, 0x6f, 0xd6, 0x8e, 0x72, 0x33, 0x78, 0x8c, 0xd3, 0xf8, 0x73, 0x01, 0xca, 0x7b, 0xd4, 0xe7, + 0x96, 0xc0, 0x47, 0x5b, 0xb0, 0xe8, 0x5b, 0x1e, 0x91, 0xeb, 0xcb, 0xad, 0xea, 0xb3, 0xf3, 0xcd, + 0x85, 0xd1, 0xf9, 0xe6, 0xe2, 0x13, 0xcb, 0x23, 0x58, 0xce, 0xa0, 0x9b, 0x50, 0x72, 0x3d, 0xab, + 0x4b, 0xf4, 0x82, 0x64, 0x59, 0x55, 0x2c, 0xa5, 0xb6, 0x20, 0xe2, 0x68, 0x0e, 0xb9, 0x50, 0x0a, + 0x68, 0xc8, 0x99, 0xbe, 0xb4, 0x55, 0xdc, 0xae, 0xdc, 0x7a, 0xd8, 0x98, 0x69, 0x27, 0x1b, 0x89, + 0x5e, 0x26, 0x0d, 0x79, 0x0a, 0x25, 0x46, 0x0c, 0x47, 0x08, 0xe8, 0xe7, 0x50, 0x3d, 0xa3, 0xfd, + 0x81, 0x47, 0x0e, 0xe9, 0xc0, 0xe7, 0x4c, 0x2f, 0x4b, 0xc4, 0xd6, 0x8c, 0x88, 0x1f, 0xa4, 0xa2, + 0x5a, 0xd7, 0x15, 0x5e, 0x35, 0x43, 0x64, 0x38, 0x87, 0x66, 0xfc, 0x4f, 0x83, 0xd5, 0x9c, 0x96, + 0xaf, 0xe0, 0xc1, 0x77, 0x61, 0xa5, 0x47, 0x19, 0x17, 0xdc, 0xd2, 0x89, 0xa5, 0xd6, 0x35, 0xc5, + 0xb5, 0xf2, 0x58, 0xd1, 0x71, 0xc2, 0x81, 0xee, 0xc1, 0xaa, 0x9d, 0x05, 0xd0, 0x8b, 0x72, 0xc9, + 0x0d, 0xb5, 0x24, 0x8f, 0x8e, 0xf3, 0xbc, 0xe8, 0x0e, 0xac, 0xc8, 0x98, 0xb1, 0x69, 0x5f, 0x5f, + 0x94, 0x0a, 0xbd, 0x1d, 0x43, 0x99, 0x8a, 0x7e, 0x91, 0xf9, 0xc6, 0x09, 0x37, 0xfa, 0x1a, 0x2c, + 0x09, 0x15, 0xda, 0xa6, 0x5e, 0x92, 0xeb, 0x6a, 0x6a, 0xdd, 0xd2, 0x63, 0x49, 0xc5, 0x6a, 0xd6, + 0xf8, 0x21, 0xac, 0xed, 0xfb, 0x4e, 0x40, 0x5d, 0x9f, 0xef, 0x3a, 0x4e, 0x48, 0x18, 0x43, 0x1b, + 0x50, 0x70, 0x03, 0x65, 0x3f, 0xa8, 0x65, 0x85, 0xb6, 0x89, 0x0b, 0x6e, 0x80, 0xb6, 0x61, 0xc5, + 0xa7, 0x0e, 0x11, 0xde, 0x50, 0x0a, 0x55, 0x85, 0x32, 0x4f, 0x14, 0x0d, 0x27, 0xb3, 0xc6, 0x27, + 0x1a, 0x54, 0x63, 0xc9, 0xaf, 0xe8, 0xd8, 0x2d, 0x58, 0x0c, 0x52, 0xa7, 0x26, 0x1c, 0xd2, 0x31, + 0x72, 0x26, 0xe7, 0x8f, 0xe2, 0xeb, 0xf8, 0xc3, 0xf8, 0xaf, 0x06, 0xb5, 0x58, 0x9d, 0xce, 0xe0, + 0x98, 0x11, 0x8e, 0x9e, 0x42, 0xd9, 0x8a, 0x4c, 0x26, 0x22, 0xe1, 0x44, 0xd8, 0x3d, 0x9a, 0x31, + 0xec, 0xc6, 0x5c, 0xd8, 0xfa, 0x92, 0xd2, 0xaa, 0xbc, 0x1b, 0x03, 0xe0, 0x14, 0x0b, 0xf5, 0xe2, + 0xec, 0x2a, 0x4a, 0xd0, 0xbd, 0x39, 0x41, 0xa7, 0x27, 0x97, 0xf1, 0x1f, 0x0d, 0xca, 0x31, 0x1b, + 0x43, 0x21, 0xac, 0x88, 0x5a, 0xe9, 0x58, 0xdc, 0x92, 0xbb, 0xf0, 0xda, 0x69, 0xc6, 0x1a, 0x62, + 0xbd, 0xc0, 0xfe, 0xc1, 0xf1, 0x4f, 0x89, 0xcd, 0x0f, 0x09, 0xb7, 0x5a, 0x48, 0x21, 0x43, 0x4a, + 0xc3, 0x09, 0x0e, 0x0a, 0x60, 0x99, 0x49, 0x77, 0x33, 0xbd, 0x20, 0xad, 0xdd, 0x9f, 0xd3, 0xda, + 0x68, 0xf3, 0x5a, 0x6b, 0x0a, 0x75, 0x39, 0x1a, 0x33, 0x1c, 0xc3, 0x18, 0xff, 0xd2, 0x60, 0x35, + 0xb1, 0xf9, 0xc0, 0x65, 0x1c, 0xf9, 0x97, 0xec, 0x7e, 0x30, 0xab, 0xdd, 0x42, 0x9e, 0xb4, 0x3a, + 0x49, 0xf9, 0x98, 0x92, 0xb1, 0x99, 0x40, 0xc9, 0xe5, 0xc4, 0x8b, 0x2d, 0x7e, 0x30, 0xa7, 0xc5, + 0x2c, 0x53, 0xa4, 0x85, 0x58, 0x1c, 0x49, 0x37, 0x7e, 0xa3, 0xc1, 0xfa, 0x7e, 0xd0, 0x23, 0x1e, + 0x09, 0xad, 0x7e, 0x52, 0x46, 0xae, 0x64, 0x9b, 0x8d, 0x1d, 0x58, 0x3f, 0xa0, 0x96, 0xd3, 0xb2, + 0xfa, 0x96, 0x6f, 0x93, 0xb0, 0xed, 0x77, 0x3f, 0xaf, 0x94, 0x18, 0xbf, 0xd5, 0x00, 0x65, 0xd7, + 0x74, 0xb8, 0xc5, 0x07, 0x0c, 0x0d, 0x60, 0xd9, 0x8d, 0x56, 0xab, 0x9c, 0x7c, 0x7f, 0x46, 0xf7, + 0x4d, 0xd0, 0x27, 0x8d, 0x1a, 0x45, 0xc0, 0x31, 0x96, 0xf1, 0x4b, 0x28, 0x8b, 0x4a, 0xc4, 0x02, + 0xcb, 0x26, 0x57, 0xe2, 0x41, 0x11, 0xb6, 0x89, 0x06, 0x5f, 0xe4, 0xb0, 0x4d, 0x8c, 0x98, 0x12, + 0xb6, 0xcf, 0x0a, 0xb0, 0x28, 0xfa, 0xc5, 0x95, 0x94, 0x23, 0x0b, 0x16, 0x59, 0x40, 0x6c, 0xd9, + 0x62, 0x2a, 0xb7, 0xbe, 0x37, 0xab, 0x89, 0xd4, 0x21, 0x9d, 0x80, 0xd8, 0x69, 0x8f, 0x12, 0x23, + 0x2c, 0x45, 0x23, 0x17, 0x96, 0x98, 0x0c, 0x65, 0xd9, 0xa1, 0x2a, 0xb7, 0x76, 0xe7, 0x01, 0x91, + 0x82, 0xd2, 0xe6, 0x1d, 0x8d, 0xb1, 0x02, 0x30, 0x3c, 0xa8, 0x08, 0xae, 0xb8, 0x71, 0x7f, 0x0b, + 0x16, 0xf9, 0x30, 0x88, 0x3b, 0xec, 0x66, 0xac, 0xdb, 0xd1, 0x30, 0x20, 0x17, 0xe7, 0x9b, 0x6b, + 0x19, 0x56, 0x41, 0xc2, 0x92, 0x19, 0x7d, 0x1d, 0x96, 0x55, 0x67, 0x52, 0x27, 0xc2, 0x24, 0x47, + 0x14, 0x2f, 0x8e, 0xe7, 0x8d, 0xbf, 0x6b, 0x20, 0x3b, 0xfd, 0x95, 0x44, 0xe7, 0x87, 0xf9, 0xe8, + 0xbc, 0x37, 0x87, 0x57, 0xa7, 0x04, 0xe6, 0xa7, 0xca, 0x3c, 0xb1, 0x97, 0xc2, 0x2d, 0x01, 0x75, + 0xf6, 0xda, 0x0f, 0xb1, 0x72, 0x67, 0xe2, 0x16, 0x33, 0x22, 0xe3, 0x78, 0x5e, 0x9c, 0x89, 0xd4, + 0x27, 0xd3, 0x97, 0xb7, 0x8a, 0xf1, 0x99, 0x48, 0xf1, 0x31, 0x9c, 0xcc, 0x22, 0x07, 0x96, 0x44, + 0x91, 0xe6, 0x4c, 0x2f, 0x49, 0x23, 0xde, 0x9b, 0xd1, 0x88, 0x23, 0x21, 0x24, 0x8d, 0x0a, 0x39, + 0x64, 0x58, 0xc9, 0x36, 0x7e, 0xa5, 0x01, 0xa4, 0xc1, 0x83, 0x58, 0xf6, 0x98, 0x53, 0x9a, 0xeb, + 0x74, 0x9d, 0x89, 0xa0, 0x97, 0x1f, 0x71, 0x8c, 0x4f, 0x0b, 0x50, 0x34, 0xa9, 0x73, 0x25, 0x39, + 0xfe, 0x61, 0x2e, 0xc7, 0xef, 0xcf, 0x68, 0xab, 0x49, 0x9d, 0xa9, 0x29, 0xde, 0x1b, 0x4b, 0xf1, + 0x07, 0x73, 0x60, 0xbc, 0x3c, 0xc3, 0x9f, 0x17, 0xa1, 0x2a, 0x02, 0x89, 0xfa, 0x8e, 0xcb, 0x5d, + 0xea, 0xa3, 0x6f, 0xe7, 0x72, 0x7c, 0x6b, 0x2c, 0xc7, 0xaf, 0x65, 0x79, 0x33, 0x49, 0xfe, 0xdd, + 0x44, 0xe1, 0x28, 0xc7, 0xbf, 0x9a, 0x87, 0x13, 0xd5, 0x21, 0x59, 0x96, 0xd7, 0x00, 0x0d, 0x61, + 0xb5, 0x6f, 0x31, 0x6e, 0x86, 0xf4, 0x98, 0x88, 0xab, 0xa8, 0x32, 0xf9, 0xbd, 0x59, 0xb7, 0x51, + 0xc8, 0x48, 0x6f, 0x3f, 0x07, 0x59, 0xd1, 0x38, 0x8f, 0x84, 0x3e, 0xd6, 0x00, 0x09, 0xca, 0x51, + 0x68, 0xf9, 0x2c, 0x32, 0xc9, 0x55, 0xf7, 0x8e, 0x79, 0x15, 0xd8, 0x50, 0x0a, 0xa0, 0x83, 0x4b, + 0xf2, 0xf1, 0x04, 0x4c, 0x71, 0x9d, 0x0a, 0x89, 0xc5, 0xa8, 0x3f, 0x7e, 0x9d, 0xc2, 0x92, 0x8a, + 0xd5, 0xac, 0x28, 0x1b, 0x1e, 0x61, 0x4c, 0xdc, 0xaf, 0x97, 0xf2, 0x65, 0xe3, 0x30, 0x22, 0xe3, + 0x78, 0xde, 0xb8, 0x09, 0x25, 0x93, 0x3a, 0x6d, 0xf3, 0xa5, 0x87, 0xa4, 0xbf, 0x69, 0x20, 0x0a, + 0xce, 0x95, 0x54, 0xdc, 0x9f, 0xe4, 0x2b, 0xee, 0xdd, 0xd9, 0x83, 0x7c, 0x4a, 0xc1, 0xfd, 0x63, + 0x51, 0x1a, 0x27, 0xeb, 0xed, 0x47, 0x1a, 0xd4, 0x5c, 0xdf, 0xe5, 0xe9, 0x39, 0x56, 0xbf, 0x3e, + 0xd7, 0x31, 0x24, 0x11, 0xd4, 0xfa, 0xb2, 0x02, 0xaf, 0xb5, 0x73, 0xf2, 0xf1, 0x18, 0x1e, 0xe2, + 0x00, 0x76, 0x8a, 0x5e, 0x78, 0x43, 0xe8, 0x49, 0xad, 0xca, 0x20, 0x67, 0x70, 0xd0, 0xfb, 0x80, + 0x18, 0x09, 0xcf, 0x5c, 0x9b, 0xec, 0xda, 0x36, 0x1d, 0xf8, 0x5c, 0xde, 0xad, 0x57, 0x64, 0x34, + 0x24, 0x51, 0xda, 0xb9, 0xc4, 0x81, 0x27, 0xac, 0x42, 0xef, 0x66, 0x6e, 0xe7, 0x20, 0x25, 0x24, + 0xfb, 0x7b, 0xf9, 0x86, 0x8e, 0x6e, 0x43, 0xa5, 0x47, 0x19, 0x7f, 0x42, 0xf8, 0x53, 0x1a, 0x9e, + 0xea, 0x95, 0x2d, 0x6d, 0x7b, 0xa5, 0xb5, 0xae, 0x16, 0x54, 0x1e, 0xa7, 0x53, 0x38, 0xcb, 0x67, + 0xfc, 0xb5, 0x08, 0xe5, 0xa4, 0x70, 0xa1, 0x26, 0x94, 0x82, 0x9e, 0xc5, 0xe2, 0x82, 0xf4, 0x56, + 0x72, 0x0d, 0x15, 0xc4, 0x8b, 0xa8, 0x0d, 0xca, 0x6f, 0x1c, 0xf1, 0xa1, 0xa7, 0xd2, 0xcb, 0x51, + 0xa9, 0x89, 0xbd, 0xbc, 0x37, 0x7b, 0x68, 0x25, 0x65, 0x2b, 0xe7, 0x68, 0x25, 0x1e, 0x67, 0xa0, + 0x5e, 0xf5, 0x45, 0x04, 0xdd, 0x14, 0xb7, 0x73, 0xa7, 0x6d, 0xaa, 0x04, 0xce, 0x5c, 0xac, 0x9d, + 0xb6, 0x89, 0xa3, 0x39, 0xd1, 0xc9, 0xe5, 0x07, 0xd3, 0xab, 0x73, 0x75, 0x72, 0x29, 0x34, 0x55, + 0x45, 0x0e, 0x19, 0x56, 0xb2, 0x91, 0x0b, 0x65, 0xc6, 0xad, 0x90, 0xcb, 0xb2, 0xb7, 0xfc, 0x06, + 0xca, 0xde, 0xaa, 0x68, 0xd8, 0x9d, 0x58, 0x24, 0x4e, 0xa5, 0x1b, 0x7f, 0x29, 0xc0, 0xb2, 0x8a, + 0xb2, 0x2b, 0x69, 0xda, 0x4e, 0xae, 0x69, 0xcf, 0x7a, 0x40, 0x51, 0x16, 0x4c, 0x6d, 0xdc, 0xfd, + 0xb1, 0xc6, 0xfd, 0x70, 0x4e, 0x9c, 0x97, 0x37, 0xef, 0x91, 0x06, 0x15, 0xc5, 0x79, 0x25, 0x05, + 0xdc, 0xce, 0x17, 0xf0, 0xfb, 0xf3, 0x19, 0x3b, 0xa5, 0x88, 0xff, 0x29, 0x35, 0xf2, 0x15, 0x9f, + 0xf9, 0xb2, 0x8f, 0x78, 0x85, 0xd7, 0x7a, 0xd4, 0x8c, 0x1f, 0x08, 0x8b, 0x53, 0x1f, 0x08, 0x55, + 0x05, 0x94, 0x0f, 0xad, 0xa5, 0xfc, 0xdb, 0xec, 0x13, 0x45, 0xc7, 0x09, 0x87, 0xf1, 0x49, 0x39, + 0xd1, 0x5d, 0x36, 0xa1, 0x6e, 0xfc, 0x30, 0xa7, 0xcd, 0x75, 0x4c, 0xce, 0xb8, 0x63, 0xca, 0xa3, + 0xf7, 0x2f, 0x60, 0x85, 0x91, 0x3e, 0xb1, 0x39, 0x0d, 0xd5, 0xe6, 0x98, 0xf3, 0x47, 0x7c, 0xa3, + 0xa3, 0x44, 0xee, 0xfb, 0x3c, 0x1c, 0xa6, 0x86, 0xc7, 0x64, 0x9c, 0x60, 0xa2, 0x26, 0x94, 0xed, + 0xfe, 0x80, 0x71, 0x12, 0xb6, 0x4d, 0xf5, 0x90, 0x9a, 0x9c, 0xe7, 0xf7, 0xe2, 0x09, 0x9c, 0xf2, + 0xa0, 0x06, 0x40, 0x32, 0x60, 0x3a, 0x92, 0xb7, 0x9c, 0x9a, 0x2c, 0xb6, 0x09, 0x15, 0x67, 0x38, + 0x50, 0x53, 0x1d, 0x53, 0xa3, 0x37, 0xe2, 0xaf, 0x8c, 0x1d, 0x53, 0x63, 0xa7, 0x67, 0x4e, 0xa8, + 0x3b, 0x50, 0x21, 0x3f, 0xe3, 0x24, 0xf4, 0xad, 0xbe, 0x40, 0x28, 0x49, 0x84, 0x35, 0xd1, 0x88, + 0xf6, 0x53, 0x32, 0xce, 0xf2, 0xa0, 0x23, 0x58, 0x63, 0x84, 0x31, 0x97, 0xfa, 0xbb, 0x27, 0x27, + 0xa2, 0x97, 0x0f, 0x65, 0x8d, 0x2c, 0xb7, 0xbe, 0xa1, 0xe0, 0xd6, 0x3a, 0xf9, 0xe9, 0x0b, 0x49, + 0x8a, 0xba, 0xa6, 0x22, 0xe1, 0x71, 0x11, 0xe8, 0x3e, 0xd4, 0xfa, 0xd9, 0x97, 0x23, 0x53, 0xf5, + 0xe2, 0xe4, 0x14, 0x91, 0x7b, 0x57, 0x32, 0xf1, 0x18, 0x37, 0xfa, 0x11, 0xe8, 0x59, 0x4a, 0x87, + 0x0e, 0x42, 0x9b, 0x60, 0xcb, 0xef, 0x92, 0xe8, 0xbf, 0x8d, 0x72, 0xeb, 0xed, 0xd1, 0xf9, 0xa6, + 0x7e, 0x30, 0x85, 0x07, 0x4f, 0x5d, 0x8d, 0x9e, 0xc2, 0x8d, 0xd8, 0xfc, 0xa3, 0xd0, 0x3a, 0x39, + 0x71, 0x6d, 0x93, 0xf6, 0x5d, 0x7b, 0x28, 0x3b, 0x77, 0xb9, 0xb5, 0xab, 0x14, 0xbc, 0xb1, 0x3f, + 0x89, 0xe9, 0xe2, 0x7c, 0x73, 0x4b, 0xd9, 0x3e, 0x71, 0x5e, 0x6e, 0xc5, 0x64, 0xf9, 0xe8, 0x10, + 0xd6, 0x7b, 0xc4, 0xea, 0xf3, 0xde, 0x5e, 0x8f, 0xd8, 0xa7, 0x71, 0x1e, 0xe9, 0x55, 0x99, 0x5f, + 0xf1, 0xde, 0xae, 0x3f, 0xbe, 0xcc, 0x82, 0x27, 0xad, 0x43, 0x7f, 0xd0, 0xe0, 0xc6, 0x98, 0xd7, + 0xa3, 0xff, 0xc1, 0xf4, 0x9a, 0x2c, 0x8a, 0x07, 0x33, 0xa7, 0xc2, 0x04, 0x99, 0xad, 0xb7, 0x84, + 0x4b, 0x26, 0x4e, 0xe1, 0xc9, 0x5a, 0xa0, 0xbb, 0x00, 0x6e, 0xf0, 0xc8, 0xf2, 0xdc, 0xbe, 0x4b, + 0x98, 0xbe, 0x2e, 0xf7, 0x6c, 0x43, 0xc4, 0x7a, 0xdb, 0x8c, 0xa9, 0xa2, 0x3e, 0xa9, 0xd1, 0x10, + 0x67, 0xb8, 0x37, 0xee, 0xc1, 0x6a, 0x2e, 0x0b, 0xd1, 0x35, 0x28, 0x9e, 0x92, 0x61, 0x54, 0x0d, + 0xb1, 0xf8, 0x44, 0xd7, 0xa1, 0x74, 0x66, 0xf5, 0x07, 0xea, 0x0f, 0x38, 0x1c, 0x0d, 0xee, 0x16, + 0xee, 0x68, 0xc6, 0xef, 0x35, 0xb1, 0x3a, 0xd3, 0x59, 0xd0, 0xaf, 0x35, 0xa8, 0x66, 0xe3, 0x41, + 0xb5, 0x8d, 0xf6, 0x1b, 0x78, 0x12, 0x55, 0xbd, 0x2b, 0xf9, 0x93, 0x2c, 0x3b, 0x87, 0x73, 0xa0, + 0xc6, 0xc7, 0x1a, 0x4c, 0xf6, 0x20, 0xa2, 0xb0, 0x62, 0xab, 0xbf, 0x32, 0x95, 0x6a, 0xb3, 0x3e, + 0xef, 0xe7, 0xff, 0x11, 0x8d, 0x5e, 0x50, 0x62, 0x1a, 0x4e, 0x40, 0x8c, 0x7f, 0x6b, 0x50, 0x92, + 0xcf, 0x1d, 0xe8, 0x9d, 0x8c, 0x63, 0x5b, 0x15, 0x65, 0x45, 0xf1, 0xfb, 0x64, 0x18, 0x79, 0xf9, + 0x66, 0xce, 0xcb, 0x69, 0x19, 0xfe, 0x40, 0x10, 0x95, 0xd3, 0xd1, 0x6d, 0x58, 0x22, 0x27, 0x27, + 0xc4, 0xe6, 0xaa, 0x06, 0xbe, 0x13, 0x37, 0xf2, 0x7d, 0x49, 0x15, 0x95, 0x4a, 0x82, 0x45, 0x43, + 0xac, 0x98, 0xc5, 0xb1, 0x8c, 0xbb, 0x1e, 0xd9, 0x75, 0x1c, 0xe2, 0xbc, 0x91, 0xdb, 0xa8, 0x3c, + 0x96, 0x1d, 0xc5, 0x22, 0x71, 0x2a, 0xdd, 0xb8, 0x0f, 0x95, 0xcc, 0xbf, 0x97, 0xa2, 0x6e, 0x7b, + 0xe2, 0xc3, 0xb4, 0x78, 0x6f, 0xbc, 0x6e, 0x1f, 0xc6, 0x13, 0x38, 0xe5, 0x69, 0x6d, 0x3f, 0x7b, + 0x51, 0x5f, 0xf8, 0xec, 0x45, 0x7d, 0xe1, 0xf9, 0x8b, 0xfa, 0xc2, 0x47, 0xa3, 0xba, 0xf6, 0x6c, + 0x54, 0xd7, 0x3e, 0x1b, 0xd5, 0xb5, 0xe7, 0xa3, 0xba, 0xf6, 0x8f, 0x51, 0x5d, 0xfb, 0xdd, 0x3f, + 0xeb, 0x0b, 0x3f, 0x2e, 0x9c, 0xed, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x97, 0x54, 0xb6, 0xfe, + 0xf4, 0x1f, 0x00, 0x00, } func (m *ClientIPConfig) Marshal() (dAtA []byte, err error) { @@ -2085,6 +2086,11 @@ func (m *PodSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x58 + i -= len(m.NodeName) + copy(dAtA[i:], m.NodeName) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.NodeName))) + i-- + dAtA[i] = 0x52 i -= len(m.ServiceAccountName) copy(dAtA[i:], m.ServiceAccountName) i = encodeVarintGenerated(dAtA, i, uint64(len(m.ServiceAccountName))) @@ -2986,6 +2992,8 @@ func (m *PodSpec) Size() (n int) { } l = len(m.ServiceAccountName) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.NodeName) + n += 1 + l + sovGenerated(uint64(l)) n += 2 if len(m.InitContainers) > 0 { for _, e := range m.InitContainers { @@ -3521,6 +3529,7 @@ func (this *PodSpec) String() string { s := strings.Join([]string{`&PodSpec{`, `Containers:` + repeatedStringForContainers + `,`, `ServiceAccountName:` + fmt.Sprintf("%v", this.ServiceAccountName) + `,`, + `NodeName:` + fmt.Sprintf("%v", this.NodeName) + `,`, `HostNetwork:` + fmt.Sprintf("%v", this.HostNetwork) + `,`, `InitContainers:` + repeatedStringForInitContainers + `,`, `}`, @@ -6465,6 +6474,38 @@ func (m *PodSpec) Unmarshal(dAtA []byte) error { } m.ServiceAccountName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NodeName", 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 < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NodeName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex case 11: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HostNetwork", wireType) diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.proto b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.proto index 09127245ab..43d8bed783 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.proto +++ b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/generated.proto @@ -407,6 +407,12 @@ message PodSpec { // +optional optional string serviceAccountName = 8; + // NodeName is a request to schedule this pod onto a specific node. If it is non-empty, + // the scheduler simply schedules this pod onto that node, assuming that it fits resource + // requirements. + // +optional + optional string nodeName = 10; + // Host networking requested for this pod. Use the host's network namespace. // If this option is set, the ports that will be used must be specified. // Default to false. diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/types.go b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/types.go index b09303e2ef..d2ff9a3843 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/types.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/types.go @@ -252,6 +252,11 @@ type PodSpec struct { // More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ // +optional ServiceAccountName string `json:"serviceAccountName,omitempty" protobuf:"bytes,8,opt,name=serviceAccountName"` + // NodeName is a request to schedule this pod onto a specific node. If it is non-empty, + // the scheduler simply schedules this pod onto that node, assuming that it fits resource + // requirements. + // +optional + NodeName string `json:"nodeName,omitempty" protobuf:"bytes,10,opt,name=nodeName"` // Host networking requested for this pod. Use the host's network namespace. // If this option is set, the ports that will be used must be specified. // Default to false. diff --git a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/zz_generated.deepequal.go b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/zz_generated.deepequal.go index 114f638cad..29cd4b4acf 100644 --- a/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/zz_generated.deepequal.go +++ b/vendor/github.com/cilium/cilium/pkg/k8s/slim/k8s/api/core/v1/zz_generated.deepequal.go @@ -671,6 +671,9 @@ func (in *PodSpec) DeepEqual(other *PodSpec) bool { if in.ServiceAccountName != other.ServiceAccountName { return false } + if in.NodeName != other.NodeName { + return false + } if in.HostNetwork != other.HostNetwork { return false } diff --git a/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go b/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go index 7c8db37a1f..ae6b485b3c 100644 --- a/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go +++ b/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go @@ -542,6 +542,9 @@ const ( // CEPName is the name of the CiliumEndpoint. CEPName = "ciliumEndpointName" + // CEPUID is the UID of the CiliumEndpoint. + CEPUID = "ciliumEndpointUID" + // CESName is the name of the CiliumEndpointSlice. CESName = "ciliumEndpointSliceName" diff --git a/vendor/github.com/cilium/cilium/pkg/option/config.go b/vendor/github.com/cilium/cilium/pkg/option/config.go index dbc248303c..58604cf20d 100644 --- a/vendor/github.com/cilium/cilium/pkg/option/config.go +++ b/vendor/github.com/cilium/cilium/pkg/option/config.go @@ -2183,6 +2183,12 @@ func (c *DaemonConfig) IptablesMasqueradingEnabled() bool { return c.IptablesMasqueradingIPv4Enabled() || c.IptablesMasqueradingIPv6Enabled() } +// NodeIpsetNeeded returns true if a node ipsets should be used to skip +// masquerading for traffic to cluster nodes. +func (c *DaemonConfig) NodeIpsetNeeded() bool { + return c.Tunnel == TunnelDisabled && c.IptablesMasqueradingEnabled() +} + // RemoteNodeIdentitiesEnabled returns true if the remote-node identity feature // is enabled func (c *DaemonConfig) RemoteNodeIdentitiesEnabled() bool { diff --git a/vendor/modules.txt b/vendor/modules.txt index 91475f5c07..dff75dfd7b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -83,7 +83,7 @@ github.com/chai2010/gettext-go/gettext/po # github.com/cilium/charts v0.0.0-20220328201227-74ca65b8ff86 ## explicit; go 1.17 github.com/cilium/charts -# github.com/cilium/cilium v1.11.2 +# github.com/cilium/cilium v1.11.3 ## explicit; go 1.17 github.com/cilium/cilium/api/v1/client github.com/cilium/cilium/api/v1/client/daemon