From 506eb29d6cbf345e87c672fcb976680273ea6b3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:59:46 +0000 Subject: [PATCH] Bump github.com/vmware-tanzu/carvel-kapp-controller Bumps [github.com/vmware-tanzu/carvel-kapp-controller](https://github.com/vmware-tanzu/carvel-kapp-controller) from 0.40.0 to 0.41.2. - [Release notes](https://github.com/vmware-tanzu/carvel-kapp-controller/releases) - [Commits](https://github.com/vmware-tanzu/carvel-kapp-controller/compare/v0.40.0...v0.41.2) --- updated-dependencies: - dependency-name: github.com/vmware-tanzu/carvel-kapp-controller dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 +- go.sum | 10 +- .../apis/kappctrl/v1alpha1/generated.pb.go | 902 +++++++++++++++--- .../apis/kappctrl/v1alpha1/generated.proto | 31 +- .../apis/kappctrl/v1alpha1/types_template.go | 28 +- .../v1alpha1/zz_generated.deepcopy.go | 66 +- vendor/golang.org/x/time/rate/rate.go | 36 +- vendor/modules.txt | 4 +- 8 files changed, 907 insertions(+), 174 deletions(-) diff --git a/go.mod b/go.mod index 2b50968b6..a7ffc2073 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.5 - github.com/vmware-tanzu/carvel-kapp-controller v0.40.0 + github.com/vmware-tanzu/carvel-kapp-controller v0.41.2 golang.org/x/net v0.0.0-20220906165146-f3363e06e74c gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.25.2 // kubernetes-1.22.1 @@ -64,7 +64,7 @@ require ( golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index ae965209f..a13875ce5 100644 --- a/go.sum +++ b/go.sum @@ -129,7 +129,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -402,8 +402,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg= github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo= -github.com/vmware-tanzu/carvel-kapp-controller v0.40.0 h1:uW59TAbvH3iGaDv0Lh7h3vyZSky9Dw7lR7vS8a3KsCw= -github.com/vmware-tanzu/carvel-kapp-controller v0.40.0/go.mod h1:F+9MyAvdn8iI4ry2wo5BeWyMoyc+jjVC8pZzNTCyJN8= +github.com/vmware-tanzu/carvel-kapp-controller v0.41.2 h1:wBpWsrrZLEJgOoSwoBr+SlA0Cfyo1sxNgyIMozT1cAQ= +github.com/vmware-tanzu/carvel-kapp-controller v0.41.2/go.mod h1:4RY30AmKTquKKcaOFkNHPEUIohywouFHueLyqs+6T6E= github.com/vmware-tanzu/carvel-vendir v0.30.0 h1:JqElRFpSsYJQmI5Hrxl1Fx9wJZ2xeDk+TVnnSrFLFVU= github.com/vmware-tanzu/carvel-vendir v0.30.0/go.mod h1:qFV2/3Cu584fhG2wXodoIm8KhX1wKHRFavBiRjK/Ly0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -620,8 +620,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go index a95e658f2..cfac16db2 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go @@ -1011,6 +1011,62 @@ func (m *GenericStatus) XXX_DiscardUnknown() { var xxx_messageInfo_GenericStatus proto.InternalMessageInfo +func (m *KubernetesAPIs) Reset() { *m = KubernetesAPIs{} } +func (*KubernetesAPIs) ProtoMessage() {} +func (*KubernetesAPIs) Descriptor() ([]byte, []int) { + return fileDescriptor_e972ccf085273df7, []int{35} +} +func (m *KubernetesAPIs) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *KubernetesAPIs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *KubernetesAPIs) XXX_Merge(src proto.Message) { + xxx_messageInfo_KubernetesAPIs.Merge(m, src) +} +func (m *KubernetesAPIs) XXX_Size() int { + return m.Size() +} +func (m *KubernetesAPIs) XXX_DiscardUnknown() { + xxx_messageInfo_KubernetesAPIs.DiscardUnknown(m) +} + +var xxx_messageInfo_KubernetesAPIs proto.InternalMessageInfo + +func (m *Version) Reset() { *m = Version{} } +func (*Version) ProtoMessage() {} +func (*Version) Descriptor() ([]byte, []int) { + return fileDescriptor_e972ccf085273df7, []int{36} +} +func (m *Version) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Version) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *Version) XXX_Merge(src proto.Message) { + xxx_messageInfo_Version.Merge(m, src) +} +func (m *Version) XXX_Size() int { + return m.Size() +} +func (m *Version) XXX_DiscardUnknown() { + xxx_messageInfo_Version.DiscardUnknown(m) +} + +var xxx_messageInfo_Version proto.InternalMessageInfo + func init() { proto.RegisterType((*AppCluster)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppCluster") proto.RegisterType((*AppClusterKubeconfigSecretRef)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppClusterKubeconfigSecretRef") @@ -1048,6 +1104,8 @@ func init() { proto.RegisterType((*AppTemplateYtt)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateYtt") proto.RegisterType((*Condition)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.Condition") proto.RegisterType((*GenericStatus)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.GenericStatus") + proto.RegisterType((*KubernetesAPIs)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.KubernetesAPIs") + proto.RegisterType((*Version)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.Version") } func init() { @@ -1055,157 +1113,166 @@ func init() { } var fileDescriptor_e972ccf085273df7 = []byte{ - // 2389 bytes of a gzipped FileDescriptorProto + // 2535 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7, - 0x15, 0xf6, 0x92, 0x94, 0x48, 0x3e, 0x49, 0xb6, 0x32, 0xb6, 0x6b, 0x42, 0xad, 0x45, 0x63, 0x03, - 0x04, 0x36, 0x5a, 0x93, 0xb0, 0xe0, 0x18, 0x46, 0x0b, 0x14, 0x10, 0x25, 0x4b, 0x96, 0x6d, 0xd9, - 0xc4, 0x50, 0x76, 0xe3, 0xb4, 0x89, 0xb3, 0x5a, 0x8e, 0xc8, 0x2d, 0xf7, 0xaf, 0xbb, 0xb3, 0xb4, - 0x18, 0xa4, 0x40, 0xff, 0x50, 0xa4, 0x4d, 0x81, 0x06, 0x05, 0x1a, 0x14, 0x2d, 0xd0, 0x63, 0x7b, - 0x2e, 0xda, 0x63, 0x2e, 0x45, 0x2f, 0x06, 0x7a, 0x09, 0x90, 0x4b, 0x4e, 0x6c, 0xcd, 0x9e, 0x7a, - 0x2c, 0x72, 0xcb, 0xa9, 0x98, 0x9f, 0xfd, 0x13, 0x29, 0x53, 0x05, 0xb4, 0x8e, 0x03, 0xf4, 0xb6, - 0x33, 0xf3, 0xe6, 0x7d, 0x6f, 0xde, 0xbc, 0xf7, 0xe6, 0xbd, 0x47, 0xc2, 0xc3, 0x8e, 0x41, 0xbb, - 0xc1, 0x6e, 0x4d, 0x77, 0xac, 0x7a, 0xdf, 0x7a, 0xac, 0x79, 0xe4, 0x32, 0xd5, 0xec, 0xb7, 0x83, - 0xba, 0xae, 0x79, 0x7d, 0x62, 0x5e, 0xee, 0x69, 0xae, 0x7b, 0x59, 0x77, 0x6c, 0xea, 0x39, 0xa6, - 0x49, 0xbc, 0xba, 0xdb, 0xeb, 0xd4, 0x35, 0xd7, 0xf0, 0xeb, 0x6c, 0x41, 0xa7, 0x9e, 0x59, 0xef, - 0x5f, 0xd1, 0x4c, 0xb7, 0xab, 0x5d, 0xa9, 0x77, 0x88, 0x4d, 0x3c, 0x8d, 0x92, 0x76, 0xcd, 0xf5, - 0x1c, 0xea, 0xa0, 0xad, 0x98, 0x75, 0x4d, 0xb0, 0x7e, 0xc4, 0x59, 0xd7, 0x04, 0xeb, 0x47, 0x8c, - 0xc3, 0xa3, 0x98, 0x75, 0xcd, 0xed, 0x75, 0x6a, 0x8c, 0x75, 0x2d, 0x64, 0x5d, 0x0b, 0x59, 0x2f, - 0x5d, 0x4e, 0x48, 0xd9, 0x71, 0x3a, 0x4e, 0x9d, 0x23, 0xec, 0x06, 0x7b, 0x7c, 0xc4, 0x07, 0xfc, - 0x4b, 0x20, 0x2f, 0xe1, 0x29, 0x87, 0xea, 0x13, 0xbb, 0x6d, 0x88, 0xb3, 0xc8, 0xcf, 0x3e, 0xf1, - 0x7c, 0xc3, 0xb1, 0xfd, 0x43, 0x4f, 0xb3, 0x74, 0xb5, 0x77, 0xdd, 0xaf, 0x19, 0x0e, 0x3b, 0xbc, - 0xa5, 0xe9, 0x5d, 0xc3, 0x26, 0xde, 0x20, 0xd6, 0x86, 0x45, 0xa8, 0x56, 0xef, 0x8f, 0xef, 0xaa, - 0x1f, 0xb6, 0xcb, 0x0b, 0x6c, 0x6a, 0x58, 0x64, 0x6c, 0xc3, 0xb5, 0x69, 0x1b, 0x7c, 0xbd, 0x4b, - 0x2c, 0xed, 0xe0, 0x3e, 0xf5, 0x53, 0x05, 0x60, 0xd5, 0x75, 0xd7, 0xcc, 0xc0, 0xa7, 0xc4, 0x43, - 0x75, 0x28, 0xdb, 0x9a, 0x45, 0x7c, 0x57, 0xd3, 0x49, 0x45, 0xb9, 0xa0, 0x5c, 0x2c, 0x37, 0x5e, - 0x7a, 0x32, 0xac, 0x9e, 0x18, 0x0d, 0xab, 0xe5, 0xbb, 0xe1, 0x02, 0x8e, 0x69, 0xd0, 0x9f, 0x15, - 0x38, 0xdd, 0x0b, 0x76, 0x89, 0xee, 0xd8, 0x7b, 0x46, 0xa7, 0x45, 0x74, 0x8f, 0x50, 0x4c, 0xf6, - 0x2a, 0xb9, 0x0b, 0xca, 0xc5, 0xb9, 0x95, 0x6e, 0xed, 0xd8, 0xee, 0xb2, 0x16, 0x4b, 0x79, 0x7b, - 0x1c, 0xaf, 0x71, 0x6e, 0x34, 0xac, 0x9e, 0x9e, 0xb0, 0x80, 0x27, 0x49, 0xa7, 0xbe, 0x05, 0xe7, - 0x9f, 0xc9, 0x0e, 0x5d, 0x80, 0x02, 0x3b, 0xa3, 0x54, 0xc1, 0xbc, 0x54, 0x41, 0x81, 0xa9, 0x00, - 0xf3, 0x15, 0x74, 0x1e, 0xf2, 0x3d, 0x32, 0xe0, 0xe7, 0x2c, 0x37, 0xe6, 0x24, 0x41, 0xfe, 0x36, - 0x19, 0x60, 0x36, 0xaf, 0xfe, 0x58, 0x81, 0xf2, 0xaa, 0xeb, 0xae, 0x13, 0xd7, 0x74, 0x06, 0xa8, - 0x0f, 0x05, 0x76, 0x20, 0xce, 0x6e, 0x6e, 0xe5, 0xb5, 0xe3, 0xd5, 0x8a, 0xc0, 0xb8, 0xad, 0xb9, - 0x6e, 0xa3, 0xc4, 0x84, 0x64, 0x5f, 0x98, 0xe3, 0xa9, 0x1f, 0xe4, 0x61, 0x21, 0x45, 0x81, 0x5e, - 0x81, 0x59, 0xc3, 0xa6, 0xce, 0x5d, 0x5f, 0x1e, 0xed, 0xa4, 0x94, 0x7c, 0x76, 0x8b, 0xcf, 0x62, - 0xb9, 0x8a, 0xaa, 0x30, 0x63, 0x69, 0xee, 0x5d, 0xbf, 0x92, 0xbb, 0x90, 0xbf, 0x58, 0x6e, 0x94, - 0x47, 0xc3, 0xea, 0xcc, 0x36, 0x9b, 0xc0, 0x62, 0x1e, 0xd5, 0x00, 0x3c, 0xed, 0xf1, 0x3d, 0x97, - 0x32, 0xf3, 0xaf, 0xe4, 0x39, 0xd5, 0xc9, 0xd1, 0xb0, 0x0a, 0x38, 0x9a, 0xc5, 0x09, 0x0a, 0xf4, - 0x53, 0x05, 0x8a, 0x86, 0xed, 0xbb, 0x44, 0xa7, 0x95, 0x02, 0x57, 0xc3, 0xa3, 0xac, 0xd4, 0xb0, - 0x25, 0x60, 0x1a, 0x73, 0xa3, 0x61, 0xb5, 0x28, 0x07, 0x38, 0x04, 0x47, 0x3f, 0x52, 0x60, 0xb6, - 0x4d, 0x4c, 0x42, 0x49, 0x65, 0x86, 0xcb, 0xf1, 0x66, 0x56, 0x72, 0xac, 0x73, 0x94, 0x06, 0x30, - 0xf5, 0x8a, 0x6f, 0x2c, 0x91, 0xd5, 0x1b, 0x70, 0x7a, 0x02, 0xe9, 0x01, 0xa5, 0x2a, 0xd3, 0x94, - 0xaa, 0x6e, 0xc0, 0x99, 0x49, 0x27, 0xff, 0x9f, 0xf9, 0xfc, 0x65, 0x16, 0x4a, 0xab, 0xae, 0xbb, - 0x41, 0xa8, 0xde, 0x45, 0xdf, 0x67, 0x26, 0x62, 0x1a, 0x36, 0x91, 0xe6, 0xfa, 0xf0, 0x78, 0xf5, - 0xc3, 0x41, 0xb6, 0x38, 0x80, 0x50, 0x8d, 0xf8, 0xc6, 0x12, 0x14, 0x0d, 0x60, 0xc6, 0xb0, 0xb4, - 0x0e, 0x91, 0x21, 0xe4, 0xb5, 0x2c, 0xd0, 0x19, 0x7f, 0x61, 0xd3, 0xfc, 0x13, 0x0b, 0x44, 0x14, - 0x40, 0xa1, 0x4b, 0xa9, 0x5b, 0xc9, 0x73, 0xe4, 0x6f, 0x65, 0x80, 0x7c, 0x73, 0x67, 0xa7, 0x29, - 0xbc, 0x94, 0x7d, 0x61, 0x0e, 0x87, 0xbe, 0x07, 0xf9, 0x8e, 0x11, 0x7a, 0xc5, 0x83, 0x0c, 0x50, - 0x37, 0x0d, 0xda, 0x28, 0xb2, 0xf0, 0xb4, 0x69, 0x50, 0xcc, 0xb0, 0xd0, 0xcf, 0x14, 0x28, 0x77, - 0x89, 0x69, 0xad, 0x75, 0x35, 0x8f, 0x4a, 0x3f, 0xf8, 0x4e, 0x16, 0xe7, 0x0d, 0x31, 0x1a, 0x0b, - 0xec, 0x09, 0x89, 0x86, 0x38, 0x46, 0x47, 0xbf, 0x56, 0x60, 0xde, 0xb0, 0x3a, 0x6e, 0xaf, 0xd3, - 0x08, 0xec, 0xb6, 0x49, 0x2a, 0xb3, 0x59, 0x84, 0x07, 0x79, 0xf1, 0x31, 0x4c, 0x63, 0x71, 0x34, - 0xac, 0xce, 0x27, 0x67, 0x70, 0x4a, 0x0c, 0xf6, 0x06, 0xb8, 0x1a, 0xed, 0x56, 0x8a, 0xe9, 0x37, - 0xa0, 0xa9, 0xd1, 0x2e, 0xe6, 0x2b, 0xea, 0xdf, 0xf3, 0x30, 0x97, 0xd0, 0x31, 0x7b, 0x13, 0x02, - 0xcf, 0x94, 0x91, 0x35, 0x7a, 0x13, 0xee, 0xe3, 0x3b, 0x98, 0xcd, 0xb3, 0x65, 0x4f, 0x3e, 0x8d, - 0x89, 0x65, 0xf6, 0x48, 0xb1, 0x79, 0xf4, 0x73, 0x05, 0xe6, 0x3d, 0xb2, 0xd7, 0x22, 0x26, 0xd1, - 0x99, 0x5b, 0x4a, 0x3d, 0xec, 0x4c, 0xd3, 0x83, 0x48, 0x45, 0xf8, 0xf1, 0xe5, 0x67, 0x98, 0x95, - 0xc4, 0x0a, 0x78, 0x20, 0x66, 0x22, 0xde, 0xe2, 0xf0, 0x38, 0x81, 0x86, 0x53, 0xd8, 0xe8, 0x5d, - 0x05, 0xca, 0x7e, 0xf4, 0x9a, 0x0b, 0x87, 0xf8, 0x76, 0x06, 0x37, 0x72, 0xc7, 0xd1, 0x35, 0x93, - 0x3d, 0xe0, 0xdc, 0x3e, 0xe2, 0x67, 0x3b, 0x06, 0x47, 0x97, 0xa0, 0xe8, 0x07, 0xbb, 0x4c, 0xed, - 0xdc, 0x45, 0xca, 0x8d, 0x53, 0x52, 0x75, 0xc5, 0x96, 0x98, 0xc6, 0xe1, 0x3a, 0xfa, 0x06, 0x2c, - 0x98, 0x7b, 0x7e, 0xab, 0x67, 0xb8, 0x2d, 0x2b, 0x68, 0x77, 0x44, 0x84, 0x2f, 0x35, 0xce, 0xca, - 0x0d, 0x0b, 0x77, 0x36, 0x5a, 0xf1, 0x22, 0x4e, 0xd3, 0xaa, 0xef, 0xe5, 0x60, 0x3e, 0xe9, 0xa7, - 0xd3, 0xae, 0xf3, 0x15, 0x98, 0xf5, 0xbb, 0xda, 0xca, 0xab, 0xd7, 0xe4, 0x8d, 0x46, 0x4f, 0x69, - 0xeb, 0xe6, 0xea, 0xca, 0xab, 0xd7, 0xb0, 0x5c, 0xfd, 0x62, 0xaa, 0x92, 0x25, 0x86, 0x2f, 0x8d, - 0x79, 0xf1, 0x11, 0xf2, 0xa2, 0x4b, 0x50, 0x94, 0xe6, 0x27, 0xd5, 0x12, 0x41, 0x48, 0x1b, 0xc4, - 0xe1, 0x3a, 0x7a, 0x5f, 0x01, 0xf0, 0x88, 0xeb, 0xf8, 0x06, 0x75, 0xbc, 0x81, 0xd4, 0xcc, 0x5b, - 0x59, 0x46, 0x21, 0x4c, 0x5c, 0x47, 0x3e, 0x84, 0x11, 0x2e, 0x4e, 0xc8, 0xa0, 0xfe, 0x55, 0x81, - 0xb3, 0x13, 0x77, 0x4d, 0x33, 0x86, 0xf4, 0x25, 0xe7, 0x3e, 0xc7, 0x4b, 0x56, 0xff, 0x93, 0xe3, - 0x49, 0x5f, 0xfc, 0xd2, 0x4d, 0x93, 0x9d, 0x05, 0x1e, 0xaa, 0x75, 0xe2, 0xc0, 0x53, 0xc8, 0x3a, - 0xf0, 0xec, 0x24, 0xd0, 0x70, 0x0a, 0xfb, 0x05, 0x52, 0x64, 0xd2, 0x5b, 0xf2, 0x53, 0xbc, 0xe5, - 0xe3, 0x1c, 0xcf, 0xc4, 0xc6, 0x1e, 0x19, 0xf4, 0x72, 0x98, 0xcd, 0x08, 0xe5, 0x2f, 0x48, 0x0e, - 0xe9, 0xbc, 0x63, 0xec, 0x02, 0xf2, 0xff, 0xbf, 0x00, 0x66, 0xc9, 0xff, 0xce, 0xc1, 0xc9, 0x74, - 0xc6, 0xc8, 0x12, 0x97, 0x19, 0xf6, 0xf6, 0x8a, 0xac, 0x76, 0x6e, 0xa5, 0x9d, 0x59, 0x72, 0x5a, - 0x63, 0x17, 0xeb, 0xdf, 0xb0, 0xa9, 0x37, 0x88, 0xaf, 0x8d, 0xcf, 0x61, 0x21, 0x01, 0x8b, 0x5f, - 0x65, 0xfe, 0xb5, 0xe1, 0x39, 0x16, 0x2f, 0x94, 0x32, 0xca, 0x5a, 0xb8, 0x3c, 0x2d, 0x27, 0xf0, - 0x74, 0x12, 0x97, 0xe3, 0xcd, 0x10, 0x19, 0xc7, 0x42, 0x2c, 0x5d, 0x07, 0x88, 0xc5, 0x46, 0x8b, - 0xa2, 0x46, 0xe5, 0xa6, 0xc7, 0xcb, 0x52, 0x74, 0x06, 0x66, 0xfa, 0x9a, 0x19, 0x88, 0xe4, 0xba, - 0x8c, 0xc5, 0xe0, 0xeb, 0xb9, 0xeb, 0x8a, 0xfa, 0xb7, 0xa4, 0x05, 0x27, 0x00, 0xd1, 0x2f, 0x53, - 0xf6, 0x20, 0x4a, 0x82, 0xdd, 0x8c, 0x4f, 0xf9, 0x6c, 0xbf, 0xfc, 0x8d, 0x02, 0xf3, 0xa2, 0x60, - 0xdf, 0xd6, 0xdc, 0xd8, 0x48, 0x9f, 0x87, 0x50, 0xdc, 0x79, 0xd6, 0x12, 0xd8, 0x38, 0x25, 0x89, - 0xba, 0x0f, 0xe7, 0x0e, 0xd9, 0xca, 0x72, 0x93, 0xb6, 0xe1, 0x11, 0x9d, 0xbd, 0x33, 0x3c, 0xa6, - 0x88, 0xe7, 0x31, 0xca, 0x4d, 0xd6, 0x93, 0x8b, 0x38, 0x4d, 0x3b, 0xfd, 0xdd, 0x55, 0xaf, 0xc2, - 0xe2, 0x41, 0xcf, 0x3a, 0xc2, 0xae, 0x0f, 0x67, 0xa1, 0xb8, 0xea, 0xba, 0x2d, 0x97, 0xe8, 0xe8, - 0x16, 0x20, 0x9f, 0x78, 0x7d, 0x43, 0x27, 0xab, 0xba, 0xee, 0x04, 0x36, 0xbd, 0x1b, 0xef, 0x5d, - 0x92, 0x7b, 0x51, 0x6b, 0x8c, 0x02, 0x4f, 0xd8, 0x85, 0xde, 0x81, 0xa2, 0x2e, 0xba, 0x2b, 0xf2, - 0x72, 0xee, 0x67, 0xd2, 0x09, 0x12, 0x25, 0xbe, 0x1c, 0xe0, 0x10, 0x12, 0xed, 0xc3, 0xcc, 0x1e, - 0x53, 0x04, 0x6f, 0x4b, 0xcc, 0xad, 0xb4, 0x32, 0x30, 0x8c, 0x38, 0x24, 0xf0, 0x21, 0x16, 0x80, - 0xe8, 0x27, 0x0a, 0x94, 0x28, 0xb1, 0x5c, 0x53, 0xa3, 0xa4, 0x52, 0xe0, 0xe8, 0xc7, 0x5c, 0xd0, - 0xed, 0x48, 0xee, 0x8d, 0x45, 0x29, 0x40, 0x29, 0x9c, 0xc1, 0x11, 0x32, 0x7a, 0x07, 0x66, 0xdb, - 0xbc, 0x29, 0x50, 0x99, 0xe1, 0x32, 0xec, 0x64, 0xd1, 0xe2, 0x88, 0x13, 0x5e, 0x31, 0xc6, 0x12, - 0x93, 0x25, 0xc6, 0xae, 0x16, 0xf8, 0xa4, 0xcd, 0x2b, 0x98, 0x52, 0x4c, 0xd7, 0xe4, 0xb3, 0x58, - 0xae, 0xa2, 0xaf, 0x41, 0x49, 0xd7, 0x6c, 0x9d, 0x98, 0xa4, 0xcd, 0x8b, 0xac, 0x52, 0x7c, 0xa6, - 0x35, 0x39, 0x8f, 0x23, 0x0a, 0xf4, 0x26, 0x80, 0x3f, 0xb0, 0xf5, 0x26, 0xf1, 0x0c, 0xa7, 0x5d, - 0x29, 0x71, 0xab, 0xaa, 0xd5, 0x44, 0xdb, 0xb3, 0x96, 0x6c, 0x7b, 0xc6, 0xc2, 0x5b, 0x84, 0x6a, - 0xb5, 0xfe, 0x95, 0xda, 0x7a, 0xe0, 0x69, 0xfc, 0xed, 0xe3, 0xa9, 0x5f, 0x2b, 0xe2, 0x82, 0x13, - 0x1c, 0xd1, 0x0a, 0x80, 0xed, 0x38, 0xb2, 0x13, 0x53, 0x29, 0x73, 0x79, 0x90, 0x94, 0x07, 0xee, - 0x46, 0x2b, 0x38, 0x41, 0xa5, 0xfe, 0xbe, 0xc8, 0x0b, 0xc0, 0xf0, 0x06, 0x10, 0x85, 0xfc, 0x80, - 0xd2, 0x6c, 0xfa, 0x26, 0x21, 0xc8, 0x43, 0x2a, 0x8b, 0xf9, 0x87, 0x94, 0x62, 0x06, 0x87, 0xf6, - 0xa1, 0xd0, 0xdb, 0x35, 0xdb, 0xd2, 0xd3, 0x5e, 0xcf, 0x06, 0xf6, 0xf6, 0xae, 0xd9, 0x96, 0xfd, - 0xc5, 0x5d, 0xb3, 0x8d, 0x39, 0x22, 0x8f, 0xc4, 0xac, 0x90, 0x0f, 0x89, 0x64, 0xe2, 0xb2, 0x9b, - 0x8d, 0x08, 0x37, 0x13, 0x48, 0x22, 0x12, 0x27, 0x67, 0x70, 0x4a, 0x12, 0xf4, 0x0b, 0x05, 0xca, - 0xbd, 0xc0, 0xa7, 0x8e, 0x65, 0xbc, 0x4d, 0xb2, 0xe9, 0x38, 0x46, 0xaa, 0x09, 0x61, 0xc4, 0x9b, - 0x15, 0x0d, 0x71, 0x2c, 0x00, 0x0b, 0x0c, 0xc5, 0xef, 0xfa, 0x8e, 0x6d, 0x93, 0xb0, 0xdd, 0xf2, - 0x46, 0x36, 0xc2, 0xdc, 0x12, 0x20, 0x22, 0x32, 0xca, 0x01, 0x0e, 0xa1, 0x99, 0xa9, 0xf8, 0x8e, - 0xeb, 0xcb, 0xd6, 0x42, 0x46, 0xa6, 0xd2, 0x72, 0x5c, 0x5f, 0x98, 0x0a, 0xfb, 0xc2, 0x1c, 0x91, - 0xb9, 0x86, 0x1e, 0x10, 0xee, 0xe7, 0x99, 0xb9, 0xc6, 0x5a, 0x40, 0x84, 0x6b, 0xac, 0x05, 0x04, - 0x33, 0x38, 0x96, 0x97, 0x9f, 0x4c, 0x13, 0xa0, 0x6a, 0x32, 0x81, 0x94, 0x9d, 0xed, 0x54, 0x5a, - 0xf7, 0x81, 0x02, 0xc0, 0xf3, 0xa2, 0x64, 0x5e, 0x97, 0x91, 0x49, 0x3f, 0xe0, 0x38, 0x32, 0xb5, - 0x8b, 0xa2, 0xcd, 0x83, 0x08, 0x1d, 0x27, 0x24, 0x41, 0xab, 0x70, 0xca, 0xb0, 0xdd, 0x80, 0xde, - 0xd8, 0x77, 0x3d, 0xe2, 0xfb, 0x61, 0xa1, 0x50, 0x6e, 0x9c, 0x93, 0x1b, 0x4f, 0x6d, 0xa5, 0x97, - 0xf1, 0x41, 0x7a, 0xb4, 0x0e, 0x8b, 0x4e, 0x40, 0xd3, 0x3c, 0x44, 0x27, 0xa0, 0x22, 0x79, 0x2c, - 0xde, 0x3b, 0xb0, 0x8e, 0xc7, 0x76, 0xa8, 0x7f, 0xcc, 0xf1, 0x34, 0x67, 0x92, 0x5f, 0x1e, 0xa1, - 0x43, 0x90, 0xfa, 0x8d, 0x29, 0x77, 0x84, 0xdf, 0x98, 0xc2, 0x46, 0x5c, 0xfe, 0xb0, 0x46, 0xdc, - 0xc1, 0x2b, 0x2b, 0xbc, 0x28, 0x57, 0xa6, 0x9e, 0x01, 0x34, 0xee, 0x9b, 0xea, 0x0a, 0x9c, 0x3a, - 0x10, 0x59, 0xa7, 0x5a, 0xa5, 0xfa, 0x25, 0x9e, 0x9e, 0x8f, 0x85, 0x1c, 0xf5, 0x0f, 0xb9, 0x14, - 0x33, 0xe6, 0x71, 0x68, 0x1f, 0xf2, 0x6e, 0x27, 0xfc, 0xb5, 0xe9, 0x8d, 0xec, 0x9c, 0xbc, 0xb9, - 0xd9, 0x14, 0xfe, 0xd6, 0xdc, 0x6c, 0x62, 0x06, 0x19, 0x1f, 0x23, 0x77, 0x88, 0x73, 0xed, 0x43, - 0x9e, 0x55, 0xc3, 0xf9, 0xac, 0x45, 0x5b, 0xed, 0xc8, 0x50, 0xb0, 0xda, 0x21, 0x98, 0x41, 0xaa, - 0x1f, 0x2b, 0xa9, 0xbb, 0x90, 0x44, 0xe8, 0x43, 0x05, 0xce, 0xb8, 0x9e, 0xd1, 0x67, 0x4a, 0x25, - 0x03, 0xbf, 0x75, 0xa0, 0xd2, 0xb1, 0x33, 0xd4, 0xde, 0x04, 0xd4, 0x46, 0x65, 0x34, 0xac, 0x9e, - 0x99, 0xb4, 0x82, 0x27, 0x4a, 0x39, 0xe9, 0x54, 0xcd, 0xcd, 0xe6, 0x17, 0xfd, 0x54, 0x9b, 0xf0, - 0xf2, 0x11, 0xd8, 0x1e, 0xa1, 0xbe, 0xf9, 0x93, 0x02, 0x5f, 0x19, 0xf3, 0xdd, 0x75, 0xe7, 0xb1, - 0xfd, 0x58, 0xf3, 0xda, 0xab, 0xcd, 0x2d, 0x56, 0xc3, 0xcf, 0x18, 0x94, 0x58, 0x61, 0x3f, 0xa1, - 0x97, 0x65, 0xd0, 0x48, 0x00, 0x6f, 0x51, 0x62, 0x25, 0xba, 0x41, 0x4c, 0x02, 0x2c, 0x04, 0x51, - 0x03, 0xb8, 0x30, 0x6d, 0xe7, 0xd1, 0xa2, 0xec, 0x9e, 0x41, 0xcc, 0x76, 0xa2, 0xd4, 0x8c, 0xa2, - 0xec, 0x46, 0xb8, 0x80, 0x63, 0x1a, 0xf5, 0xbd, 0x42, 0x2a, 0xa8, 0x27, 0xc3, 0x1c, 0xfa, 0xd5, - 0x84, 0x1e, 0x00, 0xc9, 0x3e, 0xbc, 0x3e, 0xbb, 0x0d, 0xf0, 0xbb, 0xc9, 0x6d, 0x80, 0xe7, 0x24, - 0xd7, 0x94, 0x4e, 0xc0, 0x11, 0x1e, 0xad, 0xdf, 0x2a, 0x30, 0xd7, 0x8e, 0xef, 0x55, 0xe6, 0xa8, - 0x9d, 0xe7, 0x64, 0x80, 0x8d, 0x53, 0xa3, 0x61, 0x75, 0x2e, 0x31, 0x81, 0x93, 0xc2, 0xa8, 0xdf, - 0x84, 0xa5, 0xc3, 0x0f, 0x7f, 0x04, 0xc7, 0xfb, 0x34, 0x9f, 0x4a, 0xbc, 0x1e, 0x52, 0x8a, 0x5a, - 0x70, 0xd6, 0xe8, 0xd8, 0x8e, 0x47, 0xee, 0xdb, 0x3d, 0xdb, 0x79, 0x6c, 0xaf, 0x39, 0x96, 0x45, - 0x6c, 0x2a, 0xfe, 0x89, 0x50, 0x6a, 0x9c, 0x97, 0x5c, 0xce, 0x6e, 0x4d, 0x22, 0xc2, 0x93, 0xf7, - 0xf2, 0x1f, 0x61, 0xa8, 0x67, 0xe8, 0x94, 0xdf, 0x7e, 0xa2, 0xd6, 0x6c, 0xf1, 0x59, 0x2c, 0x57, - 0x13, 0x3f, 0x6a, 0xe7, 0x3f, 0x8f, 0x1f, 0xb5, 0xa3, 0x77, 0xb1, 0x70, 0xc8, 0xbb, 0xf8, 0x55, - 0xe6, 0xae, 0x26, 0xd9, 0xd6, 0xbc, 0x9e, 0xcf, 0x8b, 0xf6, 0xb2, 0xb0, 0xfc, 0x8d, 0x70, 0x12, - 0xc7, 0xeb, 0x07, 0xd3, 0x9d, 0xd9, 0x17, 0x26, 0xdd, 0xf9, 0x87, 0x02, 0xe5, 0x35, 0xc7, 0x6e, - 0x1b, 0xbc, 0x93, 0x7c, 0x05, 0x0a, 0x74, 0xe0, 0x86, 0x56, 0x12, 0xde, 0x6f, 0x61, 0x67, 0xe0, - 0x92, 0xcf, 0x86, 0xd5, 0x85, 0x88, 0x90, 0x4d, 0x60, 0x4e, 0x8a, 0xee, 0xb0, 0xeb, 0xd4, 0x68, - 0xe0, 0xcb, 0x90, 0x75, 0x35, 0xbe, 0x4e, 0x36, 0xfb, 0xd9, 0xb0, 0xaa, 0xc6, 0x7f, 0x74, 0xaa, - 0xeb, 0x8e, 0x47, 0xea, 0xfd, 0x2b, 0xb5, 0x88, 0x93, 0xa0, 0xc2, 0x92, 0x07, 0x33, 0x0e, 0x8f, - 0x68, 0x7e, 0x94, 0x27, 0x47, 0xc6, 0x81, 0xf9, 0x2c, 0x96, 0xab, 0xe8, 0x12, 0x14, 0x2d, 0xe2, - 0xfb, 0x2c, 0x31, 0x39, 0xf0, 0xb3, 0xd8, 0xb6, 0x98, 0xc6, 0xe1, 0xba, 0xfa, 0xc3, 0x3c, 0x2c, - 0x6c, 0x12, 0x9b, 0x78, 0x86, 0x2e, 0xc0, 0xd0, 0x2d, 0x40, 0xce, 0xae, 0x4f, 0xbc, 0x3e, 0x69, - 0x6f, 0x8a, 0x3f, 0x57, 0xb1, 0xa4, 0x9a, 0x9d, 0x39, 0x1f, 0xb7, 0xcd, 0xee, 0x8d, 0x51, 0xe0, - 0x09, 0xbb, 0xd0, 0xbb, 0x0a, 0x80, 0x1e, 0x1e, 0xc6, 0x97, 0xa5, 0xc7, 0x71, 0x36, 0x6f, 0x22, - 0x4d, 0xc5, 0x57, 0x19, 0x4d, 0xf9, 0x38, 0x81, 0x8d, 0xb6, 0xe1, 0xf4, 0x9e, 0x67, 0x10, 0xbb, - 0x6d, 0x0e, 0xd6, 0x89, 0xaf, 0x7b, 0x86, 0x4b, 0xe3, 0x82, 0xe3, 0xcb, 0x72, 0xf3, 0xe9, 0x8d, - 0x71, 0x12, 0x3c, 0x69, 0x1f, 0xd3, 0x52, 0xe0, 0x93, 0xbd, 0xc0, 0xbc, 0xe1, 0x79, 0x8e, 0xb7, - 0x9d, 0xd2, 0x76, 0xa4, 0xa5, 0xfb, 0x63, 0x14, 0x78, 0xc2, 0xae, 0x46, 0xed, 0xc9, 0xd3, 0xe5, - 0x13, 0x1f, 0x3d, 0x5d, 0x3e, 0xf1, 0xc9, 0xd3, 0xe5, 0x13, 0x3f, 0x18, 0x2d, 0x2b, 0x4f, 0x46, - 0xcb, 0xca, 0x47, 0xa3, 0x65, 0xe5, 0x93, 0xd1, 0xb2, 0xf2, 0xcf, 0xd1, 0xb2, 0xf2, 0xfe, 0xbf, - 0x96, 0x4f, 0xbc, 0x5e, 0x0a, 0x0f, 0xfd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0x86, 0x5b, - 0x2b, 0xac, 0x28, 0x00, 0x00, + 0x15, 0xf6, 0x8a, 0x94, 0x28, 0x3e, 0xfd, 0x58, 0x1e, 0x5b, 0x0d, 0xab, 0x36, 0xa2, 0xb1, 0x01, + 0x82, 0x18, 0xad, 0x49, 0x58, 0x70, 0x5c, 0xa3, 0x05, 0x0a, 0x88, 0x92, 0x25, 0xcb, 0xb2, 0x6c, + 0x62, 0x28, 0xbb, 0x71, 0xda, 0xc4, 0x59, 0x2e, 0x47, 0xe4, 0x96, 0xcb, 0xdd, 0xed, 0xee, 0x2c, + 0x2d, 0x06, 0x29, 0xd0, 0x3f, 0x14, 0x69, 0x53, 0xa0, 0x46, 0x81, 0xa4, 0x45, 0x0b, 0xf4, 0x52, + 0xa0, 0xf7, 0xa2, 0x3d, 0xe6, 0x52, 0xf4, 0x62, 0xa0, 0x28, 0x10, 0x20, 0x97, 0xf4, 0xc2, 0xd6, + 0xec, 0xa9, 0xc7, 0x22, 0xb7, 0x9c, 0x8a, 0xf9, 0xd9, 0x3f, 0x92, 0x32, 0x55, 0x40, 0xeb, 0x38, + 0x40, 0x6f, 0xbb, 0x6f, 0xde, 0xbc, 0xef, 0xcd, 0x9b, 0x99, 0xf7, 0xb7, 0x0b, 0xf7, 0x9a, 0x06, + 0x6d, 0xf9, 0xf5, 0x92, 0x6e, 0x77, 0xca, 0xdd, 0xce, 0x03, 0xcd, 0x25, 0x17, 0xa9, 0x66, 0xbd, + 0xe9, 0x97, 0x75, 0xcd, 0xed, 0x12, 0xf3, 0x62, 0x5b, 0x73, 0x9c, 0x8b, 0xba, 0x6d, 0x51, 0xd7, + 0x36, 0x4d, 0xe2, 0x96, 0x9d, 0x76, 0xb3, 0xac, 0x39, 0x86, 0x57, 0x66, 0x03, 0x3a, 0x75, 0xcd, + 0x72, 0xf7, 0x92, 0x66, 0x3a, 0x2d, 0xed, 0x52, 0xb9, 0x49, 0x2c, 0xe2, 0x6a, 0x94, 0x34, 0x4a, + 0x8e, 0x6b, 0x53, 0x1b, 0xed, 0x44, 0xa2, 0x4b, 0x42, 0xf4, 0x7d, 0x2e, 0xba, 0x24, 0x44, 0xdf, + 0x67, 0x12, 0xee, 0x47, 0xa2, 0x4b, 0x4e, 0xbb, 0x59, 0x62, 0xa2, 0x4b, 0x81, 0xe8, 0x52, 0x20, + 0x7a, 0xe5, 0x62, 0x4c, 0xcb, 0xa6, 0xdd, 0xb4, 0xcb, 0x1c, 0xa1, 0xee, 0x1f, 0xf0, 0x37, 0xfe, + 0xc2, 0x9f, 0x04, 0xf2, 0x0a, 0x9e, 0xb0, 0xa8, 0x2e, 0xb1, 0x1a, 0x86, 0x58, 0x8b, 0x7c, 0xec, + 0x12, 0xd7, 0x33, 0x6c, 0xcb, 0x3b, 0x72, 0x35, 0x2b, 0x97, 0xdb, 0x57, 0xbd, 0x92, 0x61, 0xb3, + 0xc5, 0x77, 0x34, 0xbd, 0x65, 0x58, 0xc4, 0xed, 0x45, 0xd6, 0xe8, 0x10, 0xaa, 0x95, 0xbb, 0xa3, + 0xb3, 0xca, 0x47, 0xcd, 0x72, 0x7d, 0x8b, 0x1a, 0x1d, 0x32, 0x32, 0xe1, 0xca, 0xa4, 0x09, 0x9e, + 0xde, 0x22, 0x1d, 0x6d, 0x78, 0x9e, 0xfa, 0xb1, 0x02, 0xb0, 0xee, 0x38, 0x1b, 0xa6, 0xef, 0x51, + 0xe2, 0xa2, 0x32, 0xe4, 0x2d, 0xad, 0x43, 0x3c, 0x47, 0xd3, 0x49, 0x41, 0x39, 0xaf, 0xbc, 0x94, + 0xaf, 0x9c, 0x79, 0xd4, 0x2f, 0x9e, 0x1a, 0xf4, 0x8b, 0xf9, 0x5b, 0xc1, 0x00, 0x8e, 0x78, 0xd0, + 0x1f, 0x15, 0x38, 0xdb, 0xf6, 0xeb, 0x44, 0xb7, 0xad, 0x03, 0xa3, 0x59, 0x23, 0xba, 0x4b, 0x28, + 0x26, 0x07, 0x85, 0xa9, 0xf3, 0xca, 0x4b, 0x73, 0x6b, 0xad, 0xd2, 0x89, 0xed, 0x65, 0x29, 0xd2, + 0x72, 0x77, 0x14, 0xaf, 0xf2, 0xdc, 0xa0, 0x5f, 0x3c, 0x3b, 0x66, 0x00, 0x8f, 0xd3, 0x4e, 0x7d, + 0x03, 0x9e, 0x7f, 0xa2, 0x38, 0x74, 0x1e, 0xb2, 0x6c, 0x8d, 0xd2, 0x04, 0xf3, 0xd2, 0x04, 0x59, + 0x66, 0x02, 0xcc, 0x47, 0xd0, 0xf3, 0x90, 0x69, 0x93, 0x1e, 0x5f, 0x67, 0xbe, 0x32, 0x27, 0x19, + 0x32, 0xbb, 0xa4, 0x87, 0x19, 0x5d, 0xfd, 0xa1, 0x02, 0xf9, 0x75, 0xc7, 0xd9, 0x24, 0x8e, 0x69, + 0xf7, 0x50, 0x17, 0xb2, 0x6c, 0x41, 0x5c, 0xdc, 0xdc, 0xda, 0x2b, 0x27, 0x6b, 0x15, 0x81, 0xb1, + 0xab, 0x39, 0x4e, 0x65, 0x96, 0x29, 0xc9, 0x9e, 0x30, 0xc7, 0x53, 0xdf, 0xcb, 0xc0, 0x42, 0x82, + 0x03, 0xbd, 0x08, 0x33, 0x86, 0x45, 0xed, 0x5b, 0x9e, 0x5c, 0xda, 0xa2, 0xd4, 0x7c, 0x66, 0x87, + 0x53, 0xb1, 0x1c, 0x45, 0x45, 0x98, 0xee, 0x68, 0xce, 0x2d, 0xaf, 0x30, 0x75, 0x3e, 0xf3, 0x52, + 0xbe, 0x92, 0x1f, 0xf4, 0x8b, 0xd3, 0x7b, 0x8c, 0x80, 0x05, 0x1d, 0x95, 0x00, 0x5c, 0xed, 0xc1, + 0x6d, 0x87, 0xb2, 0xe3, 0x5f, 0xc8, 0x70, 0xae, 0xc5, 0x41, 0xbf, 0x08, 0x38, 0xa4, 0xe2, 0x18, + 0x07, 0xfa, 0xb1, 0x02, 0x39, 0xc3, 0xf2, 0x1c, 0xa2, 0xd3, 0x42, 0x96, 0x9b, 0xe1, 0x7e, 0x5a, + 0x66, 0xd8, 0x11, 0x30, 0x95, 0xb9, 0x41, 0xbf, 0x98, 0x93, 0x2f, 0x38, 0x00, 0x47, 0x3f, 0x50, + 0x60, 0xa6, 0x41, 0x4c, 0x42, 0x49, 0x61, 0x9a, 0xeb, 0xf1, 0x7a, 0x5a, 0x7a, 0x6c, 0x72, 0x94, + 0x0a, 0x30, 0xf3, 0x8a, 0x67, 0x2c, 0x91, 0xd5, 0x6b, 0x70, 0x76, 0x0c, 0xeb, 0x90, 0x51, 0x95, + 0x49, 0x46, 0x55, 0xb7, 0xe0, 0xdc, 0xb8, 0x95, 0xff, 0xcf, 0x72, 0xfe, 0x34, 0x03, 0xb3, 0xeb, + 0x8e, 0xb3, 0x45, 0xa8, 0xde, 0x42, 0xdf, 0x65, 0x47, 0xc4, 0x34, 0x2c, 0x22, 0x8f, 0xeb, 0xbd, + 0x93, 0xb5, 0x0f, 0x07, 0xd9, 0xe1, 0x00, 0xc2, 0x34, 0xe2, 0x19, 0x4b, 0x50, 0xd4, 0x83, 0x69, + 0xa3, 0xa3, 0x35, 0x89, 0x74, 0x21, 0xaf, 0xa4, 0x81, 0xce, 0xe4, 0x8b, 0x33, 0xcd, 0x1f, 0xb1, + 0x40, 0x44, 0x3e, 0x64, 0x5b, 0x94, 0x3a, 0x85, 0x0c, 0x47, 0xfe, 0x46, 0x0a, 0xc8, 0xd7, 0xf7, + 0xf7, 0xab, 0xe2, 0x96, 0xb2, 0x27, 0xcc, 0xe1, 0xd0, 0x77, 0x20, 0xd3, 0x34, 0x82, 0x5b, 0x71, + 0x37, 0x05, 0xd4, 0x6d, 0x83, 0x56, 0x72, 0xcc, 0x3d, 0x6d, 0x1b, 0x14, 0x33, 0x2c, 0xf4, 0x13, + 0x05, 0xf2, 0x2d, 0x62, 0x76, 0x36, 0x5a, 0x9a, 0x4b, 0xe5, 0x3d, 0xf8, 0x56, 0x1a, 0xeb, 0x0d, + 0x30, 0x2a, 0x0b, 0x2c, 0x84, 0x84, 0xaf, 0x38, 0x42, 0x47, 0xef, 0x2a, 0x30, 0x6f, 0x74, 0x9a, + 0x4e, 0xbb, 0x59, 0xf1, 0xad, 0x86, 0x49, 0x0a, 0x33, 0x69, 0xb8, 0x07, 0xb9, 0xf1, 0x11, 0x4c, + 0x65, 0x69, 0xd0, 0x2f, 0xce, 0xc7, 0x29, 0x38, 0xa1, 0x06, 0x8b, 0x01, 0x8e, 0x46, 0x5b, 0x85, + 0x5c, 0x32, 0x06, 0x54, 0x35, 0xda, 0xc2, 0x7c, 0x44, 0xfd, 0x6b, 0x06, 0xe6, 0x62, 0x36, 0x66, + 0x31, 0xc1, 0x77, 0x4d, 0xe9, 0x59, 0xc3, 0x98, 0x70, 0x07, 0xdf, 0xc4, 0x8c, 0xce, 0x86, 0x5d, + 0x19, 0x1a, 0x63, 0xc3, 0x2c, 0x48, 0x31, 0x3a, 0xfa, 0xa9, 0x02, 0xf3, 0x2e, 0x39, 0xa8, 0x11, + 0x93, 0xe8, 0xec, 0x5a, 0x4a, 0x3b, 0xec, 0x4f, 0xb2, 0x83, 0x48, 0x45, 0xf8, 0xf2, 0xe5, 0x63, + 0x90, 0x95, 0x44, 0x06, 0xb8, 0x2b, 0x28, 0xa1, 0x6c, 0xb1, 0x78, 0x1c, 0x43, 0xc3, 0x09, 0x6c, + 0xf4, 0xb6, 0x02, 0x79, 0x2f, 0x8c, 0xe6, 0xe2, 0x42, 0x7c, 0x33, 0x85, 0x1d, 0xb9, 0x69, 0xeb, + 0x9a, 0xc9, 0x02, 0x38, 0x3f, 0x1f, 0x51, 0xd8, 0x8e, 0xc0, 0xd1, 0x05, 0xc8, 0x79, 0x7e, 0x9d, + 0x99, 0x9d, 0x5f, 0x91, 0x7c, 0xe5, 0xb4, 0x34, 0x5d, 0xae, 0x26, 0xc8, 0x38, 0x18, 0x47, 0x5f, + 0x83, 0x05, 0xf3, 0xc0, 0xab, 0xb5, 0x0d, 0xa7, 0xd6, 0xf1, 0x1b, 0x4d, 0xe1, 0xe1, 0x67, 0x2b, + 0xcb, 0x72, 0xc2, 0xc2, 0xcd, 0xad, 0x5a, 0x34, 0x88, 0x93, 0xbc, 0xea, 0x3b, 0x53, 0x30, 0x1f, + 0xbf, 0xa7, 0x93, 0xb6, 0xf3, 0x45, 0x98, 0xf1, 0x5a, 0xda, 0xda, 0xcb, 0x57, 0xe4, 0x8e, 0x86, + 0xa1, 0xb4, 0x76, 0x7d, 0x7d, 0xed, 0xe5, 0x2b, 0x58, 0x8e, 0x7e, 0x36, 0x4d, 0xc9, 0x12, 0xc3, + 0x33, 0x23, 0xb7, 0xf8, 0x18, 0x79, 0xd1, 0x05, 0xc8, 0xc9, 0xe3, 0x27, 0xcd, 0x12, 0x42, 0xc8, + 0x33, 0x88, 0x83, 0x71, 0xf4, 0x50, 0x01, 0x70, 0x89, 0x63, 0x7b, 0x06, 0xb5, 0xdd, 0x9e, 0xb4, + 0xcc, 0x1b, 0x69, 0x7a, 0x21, 0x4c, 0x1c, 0x5b, 0x06, 0xc2, 0x10, 0x17, 0xc7, 0x74, 0x50, 0xff, + 0xac, 0xc0, 0xf2, 0xd8, 0x59, 0x93, 0x0e, 0x43, 0x72, 0x93, 0xa7, 0x3e, 0xc5, 0x4d, 0x56, 0xff, + 0x33, 0xc5, 0x93, 0xbe, 0x28, 0xd2, 0x4d, 0xd2, 0x9d, 0x39, 0x1e, 0xaa, 0x35, 0x23, 0xc7, 0x93, + 0x4d, 0xdb, 0xf1, 0xec, 0xc7, 0xd0, 0x70, 0x02, 0xfb, 0x19, 0x32, 0x64, 0xfc, 0xb6, 0x64, 0x26, + 0xdc, 0x96, 0x0f, 0xa7, 0x78, 0x26, 0x36, 0x12, 0x64, 0xd0, 0x0b, 0x41, 0x36, 0x23, 0x8c, 0xbf, + 0x20, 0x25, 0x24, 0xf3, 0x8e, 0x91, 0x0d, 0xc8, 0xfc, 0x7f, 0x03, 0xd8, 0x49, 0xfe, 0xf7, 0x14, + 0x2c, 0x26, 0x33, 0x46, 0x96, 0xb8, 0x4c, 0xb3, 0xd8, 0x2b, 0xb2, 0xda, 0xb9, 0xb5, 0x46, 0x6a, + 0xc9, 0x69, 0x89, 0x6d, 0xac, 0x77, 0xcd, 0xa2, 0x6e, 0x2f, 0xda, 0x36, 0x4e, 0xc3, 0x42, 0x03, + 0xe6, 0xbf, 0xf2, 0xfc, 0x69, 0xcb, 0xb5, 0x3b, 0xbc, 0x50, 0x4a, 0x29, 0x6b, 0xe1, 0xfa, 0xd4, + 0x6c, 0xdf, 0xd5, 0x49, 0x54, 0x8e, 0x57, 0x03, 0x64, 0x1c, 0x29, 0xb1, 0x72, 0x15, 0x20, 0x52, + 0x1b, 0x2d, 0x89, 0x1a, 0x95, 0x1f, 0x3d, 0x5e, 0x96, 0xa2, 0x73, 0x30, 0xdd, 0xd5, 0x4c, 0x5f, + 0x24, 0xd7, 0x79, 0x2c, 0x5e, 0xbe, 0x3a, 0x75, 0x55, 0x51, 0xff, 0x12, 0x3f, 0xc1, 0x31, 0x40, + 0xf4, 0xf3, 0xc4, 0x79, 0x10, 0x25, 0x41, 0x3d, 0xe5, 0x55, 0x3e, 0xf9, 0x5e, 0xfe, 0x4a, 0x81, + 0x79, 0x51, 0xb0, 0xef, 0x69, 0x4e, 0x74, 0x48, 0x9f, 0x86, 0x52, 0xfc, 0xf2, 0x6c, 0xc4, 0xb0, + 0x71, 0x42, 0x13, 0xf5, 0x10, 0x9e, 0x3b, 0x62, 0x2a, 0xcb, 0x4d, 0x1a, 0x86, 0x4b, 0x74, 0x16, + 0x67, 0xb8, 0x4f, 0x11, 0xe1, 0x31, 0xcc, 0x4d, 0x36, 0xe3, 0x83, 0x38, 0xc9, 0x3b, 0x39, 0xee, + 0xaa, 0x97, 0x61, 0x69, 0xf8, 0x66, 0x1d, 0x63, 0xd6, 0xfb, 0x33, 0x90, 0x5b, 0x77, 0x9c, 0x9a, + 0x43, 0x74, 0x74, 0x03, 0x90, 0x47, 0xdc, 0xae, 0xa1, 0x93, 0x75, 0x5d, 0xb7, 0x7d, 0x8b, 0xde, + 0x8a, 0xe6, 0xae, 0xc8, 0xb9, 0xa8, 0x36, 0xc2, 0x81, 0xc7, 0xcc, 0x42, 0x6f, 0x41, 0x4e, 0x17, + 0xdd, 0x15, 0xb9, 0x39, 0x77, 0x52, 0xe9, 0x04, 0x89, 0x12, 0x5f, 0xbe, 0xe0, 0x00, 0x12, 0x1d, + 0xc2, 0xf4, 0x01, 0x33, 0x04, 0x6f, 0x4b, 0xcc, 0xad, 0xd5, 0x52, 0x38, 0x18, 0x91, 0x4b, 0xe0, + 0xaf, 0x58, 0x00, 0xa2, 0x1f, 0x29, 0x30, 0x4b, 0x49, 0xc7, 0x31, 0x35, 0x4a, 0x0a, 0x59, 0x8e, + 0x7e, 0xc2, 0x05, 0xdd, 0xbe, 0x94, 0x5e, 0x59, 0x92, 0x0a, 0xcc, 0x06, 0x14, 0x1c, 0x22, 0xa3, + 0xb7, 0x60, 0xa6, 0xc1, 0x9b, 0x02, 0x85, 0x69, 0xae, 0xc3, 0x7e, 0x1a, 0x2d, 0x8e, 0x28, 0xe1, + 0x15, 0xef, 0x58, 0x62, 0xb2, 0xc4, 0xd8, 0xd1, 0x7c, 0x8f, 0x34, 0x78, 0x05, 0x33, 0x1b, 0xf1, + 0x55, 0x39, 0x15, 0xcb, 0x51, 0xf4, 0x65, 0x98, 0xd5, 0x35, 0x4b, 0x27, 0x26, 0x69, 0xf0, 0x22, + 0x6b, 0x36, 0x5a, 0xd3, 0x86, 0xa4, 0xe3, 0x90, 0x03, 0xbd, 0x0e, 0xe0, 0xf5, 0x2c, 0xbd, 0x4a, + 0x5c, 0xc3, 0x6e, 0x14, 0x66, 0xf9, 0xa9, 0x2a, 0x95, 0x44, 0xdb, 0xb3, 0x14, 0x6f, 0x7b, 0x46, + 0xca, 0x77, 0x08, 0xd5, 0x4a, 0xdd, 0x4b, 0xa5, 0x4d, 0xdf, 0xd5, 0x78, 0xec, 0xe3, 0xa9, 0x5f, + 0x2d, 0x94, 0x82, 0x63, 0x12, 0xd1, 0x1a, 0x80, 0x65, 0xdb, 0xb2, 0x13, 0x53, 0xc8, 0x73, 0x7d, + 0x90, 0xd4, 0x07, 0x6e, 0x85, 0x23, 0x38, 0xc6, 0xa5, 0xfe, 0x36, 0xc7, 0x0b, 0xc0, 0x60, 0x07, + 0x10, 0x85, 0x4c, 0x8f, 0xd2, 0x74, 0xfa, 0x26, 0x01, 0xc8, 0x3d, 0x2a, 0x8b, 0xf9, 0x7b, 0x94, + 0x62, 0x06, 0x87, 0x0e, 0x21, 0xdb, 0xae, 0x9b, 0x0d, 0x79, 0xd3, 0x5e, 0x4d, 0x07, 0x76, 0xb7, + 0x6e, 0x36, 0x64, 0x7f, 0xb1, 0x6e, 0x36, 0x30, 0x47, 0xe4, 0x9e, 0x98, 0x15, 0xf2, 0x01, 0x93, + 0x4c, 0x5c, 0xea, 0xe9, 0xa8, 0x70, 0x3d, 0x86, 0x24, 0x3c, 0x71, 0x9c, 0x82, 0x13, 0x9a, 0xa0, + 0x9f, 0x29, 0x90, 0x6f, 0xfb, 0x1e, 0xb5, 0x3b, 0xc6, 0x9b, 0x24, 0x9d, 0x8e, 0x63, 0x68, 0x9a, + 0x00, 0x46, 0xc4, 0xac, 0xf0, 0x15, 0x47, 0x0a, 0x30, 0xc7, 0x90, 0xfb, 0xb6, 0x67, 0x5b, 0x16, + 0x09, 0xda, 0x2d, 0xaf, 0xa5, 0xa3, 0xcc, 0x0d, 0x01, 0x22, 0x3c, 0xa3, 0x7c, 0xc1, 0x01, 0x34, + 0x3b, 0x2a, 0x9e, 0xed, 0x78, 0xb2, 0xb5, 0x90, 0xd2, 0x51, 0xa9, 0xd9, 0x8e, 0x27, 0x8e, 0x0a, + 0x7b, 0xc2, 0x1c, 0x91, 0x5d, 0x0d, 0xdd, 0x27, 0xfc, 0x9e, 0xa7, 0x76, 0x35, 0x36, 0x7c, 0x22, + 0xae, 0xc6, 0x86, 0x4f, 0x30, 0x83, 0x63, 0x79, 0xf9, 0x62, 0x92, 0x01, 0x15, 0xe3, 0x09, 0xa4, + 0xec, 0x6c, 0x27, 0xd2, 0xba, 0xf7, 0x14, 0x00, 0x9e, 0x17, 0xc5, 0xf3, 0xba, 0x94, 0x8e, 0xf4, + 0x5d, 0x8e, 0x23, 0x53, 0xbb, 0xd0, 0xdb, 0xdc, 0x0d, 0xd1, 0x71, 0x4c, 0x13, 0xb4, 0x0e, 0xa7, + 0x0d, 0xcb, 0xf1, 0xe9, 0xb5, 0x43, 0xc7, 0x25, 0x9e, 0x17, 0x14, 0x0a, 0xf9, 0xca, 0x73, 0x72, + 0xe2, 0xe9, 0x9d, 0xe4, 0x30, 0x1e, 0xe6, 0x47, 0x9b, 0xb0, 0x64, 0xfb, 0x34, 0x29, 0x43, 0x74, + 0x02, 0x0a, 0x52, 0xc6, 0xd2, 0xed, 0xa1, 0x71, 0x3c, 0x32, 0x43, 0xfd, 0x7b, 0x96, 0xa7, 0x39, + 0xe3, 0xee, 0xe5, 0x31, 0x3a, 0x04, 0x89, 0x6f, 0x4c, 0x53, 0xc7, 0xf8, 0xc6, 0x14, 0x34, 0xe2, + 0x32, 0x47, 0x35, 0xe2, 0x86, 0xb7, 0x2c, 0xfb, 0xcc, 0x6c, 0xd9, 0x2f, 0x15, 0x38, 0xd3, 0xf6, + 0xeb, 0xc4, 0xb5, 0x08, 0x25, 0x9e, 0xac, 0xc5, 0xa4, 0x03, 0xc0, 0x27, 0xa8, 0x9f, 0x94, 0x5c, + 0x59, 0x1e, 0xf4, 0x8b, 0x67, 0x76, 0x87, 0x01, 0xf1, 0xa8, 0x0e, 0xe8, 0x5d, 0x05, 0x16, 0x23, + 0xea, 0x7a, 0x75, 0x27, 0x70, 0x0a, 0x27, 0x79, 0x37, 0x77, 0x13, 0x00, 0x15, 0x34, 0xe8, 0x17, + 0x17, 0x93, 0x34, 0x3c, 0xa4, 0x84, 0x7a, 0x0e, 0xd0, 0xa8, 0x37, 0x53, 0xd7, 0xe0, 0xf4, 0x50, + 0x2c, 0x9a, 0x78, 0x8f, 0xd5, 0xcf, 0xf1, 0x82, 0x66, 0xc4, 0x49, 0xab, 0xbf, 0x9f, 0x4a, 0x08, + 0x63, 0x3e, 0x0a, 0x1d, 0x42, 0xc6, 0x69, 0x06, 0xdf, 0xe7, 0x5e, 0x4b, 0xcf, 0x2d, 0x56, 0xb7, + 0xab, 0xc2, 0x43, 0x55, 0xb7, 0xab, 0x98, 0x41, 0x46, 0xcb, 0x98, 0x3a, 0xc2, 0x1d, 0x1d, 0x42, + 0x46, 0x6b, 0x06, 0x91, 0x35, 0x45, 0xd5, 0xd6, 0x9b, 0xd2, 0x79, 0xae, 0x37, 0x09, 0x66, 0x90, + 0xea, 0x87, 0x4a, 0x62, 0x2f, 0x24, 0x13, 0x7a, 0x5f, 0x81, 0x73, 0x8e, 0x6b, 0x74, 0x99, 0x51, + 0x49, 0xcf, 0xab, 0x0d, 0xd5, 0x86, 0x56, 0x8a, 0xd6, 0x1b, 0x83, 0x5a, 0x29, 0x0c, 0xfa, 0xc5, + 0x73, 0xe3, 0x46, 0xf0, 0x58, 0x2d, 0xc7, 0xad, 0xaa, 0xba, 0x5d, 0xfd, 0xac, 0xaf, 0x6a, 0x1b, + 0x5e, 0x38, 0x86, 0xd8, 0x63, 0x54, 0x84, 0x7f, 0x50, 0xe0, 0x8b, 0x23, 0xde, 0x6e, 0xd3, 0x7e, + 0x60, 0x3d, 0xd0, 0xdc, 0xc6, 0x7a, 0x75, 0x07, 0x3d, 0x54, 0x60, 0xda, 0xa0, 0xa4, 0x13, 0x74, + 0x60, 0xda, 0x69, 0xba, 0xd9, 0x18, 0xf0, 0x0e, 0x25, 0x9d, 0x58, 0xff, 0x8c, 0x69, 0x80, 0x85, + 0x22, 0xea, 0xdf, 0xb2, 0x70, 0x7e, 0xd2, 0xd4, 0xe3, 0x05, 0xa6, 0x03, 0x83, 0x98, 0x8d, 0x58, + 0x75, 0x1e, 0x06, 0xa6, 0xad, 0x60, 0x00, 0x47, 0x3c, 0x47, 0x78, 0xf7, 0xcc, 0x33, 0xe0, 0xdd, + 0x7f, 0xa7, 0xc0, 0x32, 0x93, 0xb3, 0x11, 0xca, 0x0f, 0xb4, 0xcb, 0xa6, 0xa6, 0xdd, 0xe7, 0x07, + 0xfd, 0xe2, 0xf2, 0xee, 0x38, 0x50, 0x3c, 0x5e, 0x97, 0x71, 0x31, 0x68, 0xfa, 0x59, 0x88, 0x41, + 0xef, 0x24, 0xf3, 0x9b, 0x78, 0xc4, 0x47, 0xbf, 0x18, 0xd3, 0x0e, 0x23, 0xe9, 0x67, 0x1a, 0x4f, + 0xee, 0x88, 0xfd, 0x66, 0x7c, 0x47, 0xec, 0x29, 0xe9, 0x35, 0xa1, 0x29, 0x76, 0x8c, 0xfc, 0xed, + 0xd7, 0x0a, 0xcc, 0x35, 0xa2, 0xfb, 0x2a, 0x0f, 0x69, 0xf3, 0x29, 0x79, 0x96, 0xca, 0xe9, 0x41, + 0xbf, 0x38, 0x17, 0x23, 0xe0, 0xb8, 0x32, 0xea, 0xd7, 0x61, 0xe5, 0xe8, 0xc5, 0x1f, 0xc3, 0xa3, + 0x7e, 0x9c, 0x49, 0xd4, 0x20, 0xf7, 0x28, 0x45, 0x35, 0x58, 0x36, 0x9a, 0x96, 0xed, 0x92, 0x3b, + 0x56, 0xdb, 0xb2, 0x1f, 0x58, 0x1b, 0x76, 0xa7, 0x43, 0x2c, 0x2a, 0x7e, 0xca, 0x99, 0xad, 0x3c, + 0x2f, 0xa5, 0x2c, 0xef, 0x8c, 0x63, 0xc2, 0xe3, 0xe7, 0xf2, 0xef, 0x91, 0xd4, 0x35, 0x74, 0xca, + 0x77, 0x3f, 0xd6, 0x76, 0xa9, 0x71, 0x2a, 0x96, 0xa3, 0xb1, 0xff, 0x3b, 0x32, 0x9f, 0xc6, 0xff, + 0x1d, 0x61, 0xc2, 0x93, 0x3d, 0x22, 0xe1, 0xf9, 0x12, 0x73, 0xc3, 0x26, 0xd9, 0xd3, 0xdc, 0xb6, + 0xc7, 0xfb, 0x57, 0x79, 0x71, 0xf2, 0xb7, 0x02, 0x22, 0x8e, 0xc6, 0x87, 0x33, 0xff, 0x99, 0x67, + 0x25, 0xf3, 0x57, 0xff, 0xa1, 0x40, 0x7e, 0xc3, 0xb6, 0x1a, 0x06, 0xff, 0xa8, 0x72, 0x09, 0xb2, + 0xb4, 0xe7, 0x04, 0xa7, 0x24, 0xd8, 0xdf, 0xec, 0x7e, 0xcf, 0x21, 0x9f, 0xf4, 0x8b, 0x0b, 0x21, + 0x23, 0x23, 0x60, 0xce, 0x8a, 0x6e, 0xb2, 0xed, 0xd4, 0xa8, 0xef, 0xc9, 0x50, 0x74, 0x39, 0xda, + 0x4e, 0x46, 0xfd, 0xa4, 0x5f, 0x54, 0xa3, 0x7f, 0xfe, 0xca, 0xba, 0xed, 0x92, 0x72, 0xf7, 0x52, + 0x29, 0x94, 0x24, 0xb8, 0xb0, 0x94, 0xc1, 0x0e, 0x87, 0x4b, 0x34, 0x2f, 0x2c, 0x19, 0xc3, 0xc3, + 0x81, 0x39, 0x15, 0xcb, 0x51, 0x74, 0x01, 0x72, 0x1d, 0xe2, 0x79, 0x2c, 0xe3, 0x1c, 0xfa, 0x42, + 0xbc, 0x27, 0xc8, 0x38, 0x18, 0x57, 0xbf, 0x9f, 0x81, 0x85, 0x6d, 0x62, 0x11, 0xd7, 0xd0, 0x05, + 0x18, 0xba, 0x01, 0xc8, 0xae, 0x7b, 0xc4, 0xed, 0x92, 0xc6, 0xb6, 0xf8, 0xcf, 0x90, 0x45, 0x1c, + 0xb6, 0xe6, 0x4c, 0xd4, 0x41, 0xbe, 0x3d, 0xc2, 0x81, 0xc7, 0xcc, 0x42, 0x6f, 0x2b, 0x00, 0x7a, + 0xb0, 0x18, 0x4f, 0x56, 0xe1, 0x27, 0xd9, 0xc7, 0x0c, 0x2d, 0x15, 0x6d, 0x65, 0x48, 0xf2, 0x70, + 0x0c, 0x1b, 0xed, 0xc1, 0xd9, 0x03, 0xd7, 0x20, 0x56, 0xc3, 0xec, 0x6d, 0x12, 0x4f, 0x77, 0x0d, + 0x87, 0x46, 0xb5, 0xf7, 0x17, 0xe4, 0xe4, 0xb3, 0x5b, 0xa3, 0x2c, 0x78, 0xdc, 0x3c, 0x66, 0x25, + 0xdf, 0x23, 0x07, 0xbe, 0x79, 0xcd, 0x75, 0x6d, 0x77, 0x2f, 0x61, 0xed, 0xd0, 0x4a, 0x77, 0x46, + 0x38, 0xf0, 0x98, 0x59, 0xea, 0x0e, 0x0c, 0xc5, 0x32, 0xf4, 0x15, 0x58, 0x68, 0xba, 0xb6, 0xef, + 0xc8, 0x18, 0x1b, 0x94, 0x47, 0x67, 0x06, 0xfd, 0xe2, 0xc2, 0x76, 0x7c, 0x00, 0x27, 0xf9, 0xd4, + 0xcb, 0x10, 0x7c, 0xa1, 0x8f, 0x7f, 0xc3, 0x57, 0x9e, 0xfc, 0x0d, 0xbf, 0x62, 0x3f, 0x7a, 0xbc, + 0x7a, 0xea, 0x83, 0xc7, 0xab, 0xa7, 0x3e, 0x7a, 0xbc, 0x7a, 0xea, 0x7b, 0x83, 0x55, 0xe5, 0xd1, + 0x60, 0x55, 0xf9, 0x60, 0xb0, 0xaa, 0x7c, 0x34, 0x58, 0x55, 0xfe, 0x39, 0x58, 0x55, 0x1e, 0xfe, + 0x6b, 0xf5, 0xd4, 0xab, 0x3b, 0x27, 0xf6, 0xb7, 0xf0, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x5f, + 0x86, 0xfa, 0x6d, 0x79, 0x2c, 0x00, 0x00, } func (m *AppCluster) Marshal() (dAtA []byte, err error) { @@ -2334,6 +2401,30 @@ func (m *AppTemplateHelmTemplate) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.KubernetesAPIs != nil { + { + size, err := m.KubernetesAPIs.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + if m.KubernetesVersion != nil { + { + size, err := m.KubernetesVersion.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } if len(m.ValuesFrom) > 0 { for iNdEx := len(m.ValuesFrom) - 1; iNdEx >= 0; iNdEx-- { { @@ -2655,6 +2746,42 @@ func (m *AppTemplateValuesDownwardAPIItem) MarshalToSizedBuffer(dAtA []byte) (in _ = i var l int _ = l + if m.KubernetesAPIs != nil { + { + size, err := m.KubernetesAPIs.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + if m.KappControllerVersion != nil { + { + size, err := m.KappControllerVersion.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.KubernetesVersion != nil { + { + size, err := m.KubernetesVersion.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } i -= len(m.FieldPath) copy(dAtA[i:], m.FieldPath) i = encodeVarintGenerated(dAtA, i, uint64(len(m.FieldPath))) @@ -2936,6 +3063,66 @@ func (m *GenericStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *KubernetesAPIs) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *KubernetesAPIs) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *KubernetesAPIs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.GroupVersions) > 0 { + for iNdEx := len(m.GroupVersions) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.GroupVersions[iNdEx]) + copy(dAtA[i:], m.GroupVersions[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.GroupVersions[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *Version) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Version) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Version) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + i -= len(m.Version) + copy(dAtA[i:], m.Version) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Version))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func encodeVarintGenerated(dAtA []byte, offset int, v uint64) int { offset -= sovGenerated(v) base := offset @@ -3383,6 +3570,14 @@ func (m *AppTemplateHelmTemplate) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } + if m.KubernetesVersion != nil { + l = m.KubernetesVersion.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + if m.KubernetesAPIs != nil { + l = m.KubernetesAPIs.Size() + n += 1 + l + sovGenerated(uint64(l)) + } return n } @@ -3504,6 +3699,18 @@ func (m *AppTemplateValuesDownwardAPIItem) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.FieldPath) n += 1 + l + sovGenerated(uint64(l)) + if m.KubernetesVersion != nil { + l = m.KubernetesVersion.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + if m.KappControllerVersion != nil { + l = m.KappControllerVersion.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + if m.KubernetesAPIs != nil { + l = m.KubernetesAPIs.Size() + n += 1 + l + sovGenerated(uint64(l)) + } return n } @@ -3611,6 +3818,32 @@ func (m *GenericStatus) Size() (n int) { return n } +func (m *KubernetesAPIs) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.GroupVersions) > 0 { + for _, s := range m.GroupVersions { + l = len(s) + n += 1 + l + sovGenerated(uint64(l)) + } + } + return n +} + +func (m *Version) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Version) + n += 1 + l + sovGenerated(uint64(l)) + return n +} + func sovGenerated(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3914,6 +4147,8 @@ func (this *AppTemplateHelmTemplate) String() string { `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `Path:` + fmt.Sprintf("%v", this.Path) + `,`, `ValuesFrom:` + repeatedStringForValuesFrom + `,`, + `KubernetesVersion:` + strings.Replace(this.KubernetesVersion.String(), "Version", "Version", 1) + `,`, + `KubernetesAPIs:` + strings.Replace(this.KubernetesAPIs.String(), "KubernetesAPIs", "KubernetesAPIs", 1) + `,`, `}`, }, "") return s @@ -4010,6 +4245,9 @@ func (this *AppTemplateValuesDownwardAPIItem) String() string { s := strings.Join([]string{`&AppTemplateValuesDownwardAPIItem{`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `FieldPath:` + fmt.Sprintf("%v", this.FieldPath) + `,`, + `KubernetesVersion:` + strings.Replace(this.KubernetesVersion.String(), "Version", "Version", 1) + `,`, + `KappControllerVersion:` + strings.Replace(this.KappControllerVersion.String(), "Version", "Version", 1) + `,`, + `KubernetesAPIs:` + strings.Replace(this.KubernetesAPIs.String(), "KubernetesAPIs", "KubernetesAPIs", 1) + `,`, `}`, }, "") return s @@ -4088,6 +4326,26 @@ func (this *GenericStatus) String() string { }, "") return s } +func (this *KubernetesAPIs) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&KubernetesAPIs{`, + `GroupVersions:` + fmt.Sprintf("%v", this.GroupVersions) + `,`, + `}`, + }, "") + return s +} +func (this *Version) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&Version{`, + `Version:` + fmt.Sprintf("%v", this.Version) + `,`, + `}`, + }, "") + return s +} func valueToStringGenerated(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -7608,6 +7866,78 @@ func (m *AppTemplateHelmTemplate) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field KubernetesVersion", 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 + } + if m.KubernetesVersion == nil { + m.KubernetesVersion = &Version{} + } + if err := m.KubernetesVersion.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field KubernetesAPIs", 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 + } + if m.KubernetesAPIs == nil { + m.KubernetesAPIs = &KubernetesAPIs{} + } + if err := m.KubernetesAPIs.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -8396,6 +8726,114 @@ func (m *AppTemplateValuesDownwardAPIItem) Unmarshal(dAtA []byte) error { } m.FieldPath = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field KubernetesVersion", 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 + } + if m.KubernetesVersion == nil { + m.KubernetesVersion = &Version{} + } + if err := m.KubernetesVersion.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field KappControllerVersion", 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 + } + if m.KappControllerVersion == nil { + m.KappControllerVersion = &Version{} + } + if err := m.KappControllerVersion.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field KubernetesAPIs", 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 + } + if m.KubernetesAPIs == nil { + m.KubernetesAPIs = &KubernetesAPIs{} + } + if err := m.KubernetesAPIs.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -9258,6 +9696,170 @@ func (m *GenericStatus) Unmarshal(dAtA []byte) error { } return nil } +func (m *KubernetesAPIs) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: KubernetesAPIs: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: KubernetesAPIs: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GroupVersions", 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.GroupVersions = append(m.GroupVersions, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Version) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Version: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Version: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Version", 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.Version = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipGenerated(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto index d7ae2d2e6..751896e47 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto @@ -11,7 +11,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "v1alpha1"; +option go_package = "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"; // +k8s:openapi-gen=true message AppCluster { @@ -331,6 +331,13 @@ message AppTemplateHelmTemplate { // One or more secrets, config maps, paths that provide values (optional) repeated AppTemplateValuesSource valuesFrom = 4; + + // Optional: Get Kubernetes version, defaults (empty) to retrieving the version from the cluster. + // Can be manually overridden to a value instead. + optional Version kubernetesVersion = 5; + + // Optional: Use kubernetes group/versions resources available in the live cluster + optional KubernetesAPIs kubernetesAPIs = 6; } // TODO implement jsonnet @@ -387,6 +394,18 @@ message AppTemplateValuesDownwardAPIItem { // Required: Selects a field of the app: only annotations, labels, uid, name and namespace are supported. optional string fieldPath = 2; + + // Optional: Get running Kubernetes version from cluster, defaults (empty) to retrieving the version from the cluster. + // Can be manually supplied instead. + optional Version kubernetesVersion = 3; + + // Optional: Get running KappController version, defaults (empty) to retrieving the current running version.. + // Can be manually supplied instead. + optional Version kappControllerVersion = 4; + + // Optional: Get running KubernetesAPIs from cluster, defaults (empty) to retrieving the APIs from the cluster. + // Can be manually supplied instead, e.g ["group/version", "group2/version2"] + optional KubernetesAPIs kubernetesAPIs = 5; } // +k8s:openapi-gen=true @@ -463,3 +482,13 @@ message GenericStatus { optional string usefulErrorMessage = 4; } +// +k8s:openapi-gen=true +message KubernetesAPIs { + repeated string groupVersions = 1; +} + +// +k8s:openapi-gen=true +message Version { + optional string version = 1; +} + diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go index 58c5cb957..1e9470d4d 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go @@ -53,6 +53,11 @@ type AppTemplateHelmTemplate struct { Path string `json:"path,omitempty" protobuf:"bytes,3,opt,name=path"` // One or more secrets, config maps, paths that provide values (optional) ValuesFrom []AppTemplateValuesSource `json:"valuesFrom,omitempty" protobuf:"bytes,4,rep,name=valuesFrom"` + // Optional: Get Kubernetes version, defaults (empty) to retrieving the version from the cluster. + // Can be manually overridden to a value instead. + KubernetesVersion *Version `json:"kubernetesVersion,omitempty" protobuf:"bytes,5,opt,name=kubernetesVersion"` + // Optional: Use kubernetes group/versions resources available in the live cluster + KubernetesAPIs *KubernetesAPIs `json:"kubernetesAPIs,omitempty" protobuf:"bytes,6,opt,name=kubernetesAPIs"` } // +k8s:openapi-gen=true @@ -68,16 +73,35 @@ type AppTemplateValuesSourceRef struct { Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"` } +// +k8s:openapi-gen=true +type AppTemplateValuesDownwardAPI struct { + Items []AppTemplateValuesDownwardAPIItem `json:"items,omitempty" protobuf:"bytes,1,opt,name=items"` +} + // +k8s:openapi-gen=true type AppTemplateValuesDownwardAPIItem struct { Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"` // Required: Selects a field of the app: only annotations, labels, uid, name and namespace are supported. FieldPath string `json:"fieldPath,omitempty" protobuf:"bytes,2,opt,name=fieldPath"` + // Optional: Get running Kubernetes version from cluster, defaults (empty) to retrieving the version from the cluster. + // Can be manually supplied instead. + KubernetesVersion *Version `json:"kubernetesVersion,omitempty" protobuf:"bytes,3,opt,name=kubernetesVersion"` + // Optional: Get running KappController version, defaults (empty) to retrieving the current running version.. + // Can be manually supplied instead. + KappControllerVersion *Version `json:"kappControllerVersion,omitempty" protobuf:"bytes,4,opt,name=kappControllerVersion"` + // Optional: Get running KubernetesAPIs from cluster, defaults (empty) to retrieving the APIs from the cluster. + // Can be manually supplied instead, e.g ["group/version", "group2/version2"] + KubernetesAPIs *KubernetesAPIs `json:"kubernetesAPIs,omitempty" protobuf:"bytes,5,opt,name=kubernetesAPIs"` } // +k8s:openapi-gen=true -type AppTemplateValuesDownwardAPI struct { - Items []AppTemplateValuesDownwardAPIItem `json:"items,omitempty" protobuf:"bytes,1,opt,name=items"` +type Version struct { + Version string `json:"version,omitempty" protobuf:"bytes,1,opt,name=version"` +} + +// +k8s:openapi-gen=true +type KubernetesAPIs struct { + GroupVersions []string `json:"groupVersions,omitempty" protobuf:"bytes,1,opt,name=groupVersions"` } // TODO implement kustomize diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go index c8d42c15d..b51afa929 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go @@ -731,6 +731,16 @@ func (in *AppTemplateHelmTemplate) DeepCopyInto(out *AppTemplateHelmTemplate) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.KubernetesVersion != nil { + in, out := &in.KubernetesVersion, &out.KubernetesVersion + *out = new(Version) + **out = **in + } + if in.KubernetesAPIs != nil { + in, out := &in.KubernetesAPIs, &out.KubernetesAPIs + *out = new(KubernetesAPIs) + (*in).DeepCopyInto(*out) + } return } @@ -892,7 +902,9 @@ func (in *AppTemplateValuesDownwardAPI) DeepCopyInto(out *AppTemplateValuesDownw if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]AppTemplateValuesDownwardAPIItem, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } return } @@ -910,6 +922,21 @@ func (in *AppTemplateValuesDownwardAPI) DeepCopy() *AppTemplateValuesDownwardAPI // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AppTemplateValuesDownwardAPIItem) DeepCopyInto(out *AppTemplateValuesDownwardAPIItem) { *out = *in + if in.KubernetesVersion != nil { + in, out := &in.KubernetesVersion, &out.KubernetesVersion + *out = new(Version) + **out = **in + } + if in.KappControllerVersion != nil { + in, out := &in.KappControllerVersion, &out.KappControllerVersion + *out = new(Version) + **out = **in + } + if in.KubernetesAPIs != nil { + in, out := &in.KubernetesAPIs, &out.KubernetesAPIs + *out = new(KubernetesAPIs) + (*in).DeepCopyInto(*out) + } return } @@ -1087,3 +1114,40 @@ func (in *KappDeployStatus) DeepCopy() *KappDeployStatus { in.DeepCopyInto(out) return out } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubernetesAPIs) DeepCopyInto(out *KubernetesAPIs) { + *out = *in + if in.GroupVersions != nil { + in, out := &in.GroupVersions, &out.GroupVersions + *out = make([]string, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubernetesAPIs. +func (in *KubernetesAPIs) DeepCopy() *KubernetesAPIs { + if in == nil { + return nil + } + out := new(KubernetesAPIs) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Version) DeepCopyInto(out *Version) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Version. +func (in *Version) DeepCopy() *Version { + if in == nil { + return nil + } + out := new(Version) + in.DeepCopyInto(out) + return out +} diff --git a/vendor/golang.org/x/time/rate/rate.go b/vendor/golang.org/x/time/rate/rate.go index b0b982e9c..12e813cc7 100644 --- a/vendor/golang.org/x/time/rate/rate.go +++ b/vendor/golang.org/x/time/rate/rate.go @@ -196,13 +196,15 @@ func (lim *Limiter) Reserve() *Reservation { // The Limiter takes this Reservation into account when allowing future events. // The returned Reservation’s OK() method returns false if n exceeds the Limiter's burst size. // Usage example: -// r := lim.ReserveN(time.Now(), 1) -// if !r.OK() { -// // Not allowed to act! Did you remember to set lim.burst to be > 0 ? -// return -// } -// time.Sleep(r.Delay()) -// Act() +// +// r := lim.ReserveN(time.Now(), 1) +// if !r.OK() { +// // Not allowed to act! Did you remember to set lim.burst to be > 0 ? +// return +// } +// time.Sleep(r.Delay()) +// Act() +// // Use this method if you wish to wait and slow down in accordance with the rate limit without dropping events. // If you need to respect a deadline or cancel the delay, use Wait instead. // To drop or skip events exceeding rate limit, use Allow instead. @@ -221,6 +223,18 @@ func (lim *Limiter) Wait(ctx context.Context) (err error) { // canceled, or the expected wait time exceeds the Context's Deadline. // The burst limit is ignored if the rate limit is Inf. func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) { + // The test code calls lim.wait with a fake timer generator. + // This is the real timer generator. + newTimer := func(d time.Duration) (<-chan time.Time, func() bool, func()) { + timer := time.NewTimer(d) + return timer.C, timer.Stop, func() {} + } + + return lim.wait(ctx, n, time.Now(), newTimer) +} + +// wait is the internal implementation of WaitN. +func (lim *Limiter) wait(ctx context.Context, n int, now time.Time, newTimer func(d time.Duration) (<-chan time.Time, func() bool, func())) error { lim.mu.Lock() burst := lim.burst limit := lim.limit @@ -236,7 +250,6 @@ func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) { default: } // Determine wait limit - now := time.Now() waitLimit := InfDuration if deadline, ok := ctx.Deadline(); ok { waitLimit = deadline.Sub(now) @@ -251,10 +264,11 @@ func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) { if delay == 0 { return nil } - t := time.NewTimer(delay) - defer t.Stop() + ch, stop, advance := newTimer(delay) + defer stop() + advance() // only has an effect when testing select { - case <-t.C: + case <-ch: // We can proceed. return nil case <-ctx.Done(): diff --git a/vendor/modules.txt b/vendor/modules.txt index bdb1101c2..3e90d2ad1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -175,7 +175,7 @@ github.com/stretchr/testify/require ## explicit github.com/vito/go-interact/interact github.com/vito/go-interact/interact/terminal -# github.com/vmware-tanzu/carvel-kapp-controller v0.40.0 +# github.com/vmware-tanzu/carvel-kapp-controller v0.41.2 ## explicit; go 1.19 github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1 github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1 @@ -220,7 +220,7 @@ golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/width -# golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 +# golang.org/x/time v0.0.0-20220609170525-579cf78fd858 ## explicit golang.org/x/time/rate # google.golang.org/appengine v1.6.7