From 432d470c14a912719258e8bd7524740121487055 Mon Sep 17 00:00:00 2001 From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:39:15 +0530 Subject: [PATCH] Add defaultNamespace in pkgi/app crs Signed-off-by: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> --- config/config/crds.yml | 9 + hack/dependencies.yml | 15 +- pkg/apis/kappctrl/v1alpha1/generated.pb.go | 361 ++++++++++-------- pkg/apis/kappctrl/v1alpha1/generated.proto | 5 + pkg/apis/kappctrl/v1alpha1/types.go | 4 + .../packaging/v1alpha1/package_install.go | 4 + pkg/apiserver/openapi/zz_generated.openapi.go | 7 + pkg/app/app_deploy.go | 4 +- pkg/componentinfo/component_info.go | 2 +- pkg/deploy/factory.go | 11 +- pkg/deploy/kapp.go | 10 +- pkg/kubeconfig/kubeconfig.go | 6 +- pkg/packageinstall/app.go | 1 + pkg/packageinstall/app_test.go | 39 ++ pkg/packageinstall/packageinstall.go | 1 + pkg/pkgrepository/app_deploy.go | 2 +- .../kappcontroller/default_namespace_test.go | 222 +++++++++++ test/e2e/service_accounts.go | 60 +++ 18 files changed, 583 insertions(+), 180 deletions(-) create mode 100644 test/e2e/kappcontroller/default_namespace_test.go diff --git a/config/config/crds.yml b/config/config/crds.yml index 5848883c57..38e4f04245 100644 --- a/config/config/crds.yml +++ b/config/config/crds.yml @@ -160,6 +160,9 @@ spec: description: Specifies namespace in destination cluster (optional) type: string type: object + defaultNamespace: + description: Specifies the default namespace to install the App resources, by default this is same as the App's namespace (optional; v0.48.0+) + type: string deploy: items: properties: @@ -773,6 +776,9 @@ spec: description: Specifies namespace in destination cluster (optional) type: string type: object + defaultNamespace: + description: Specifies the default namespace to install the App resources, by default this is same as the App's namespace (optional; v0.48.0+) + type: string deploy: items: properties: @@ -1502,6 +1508,9 @@ spec: description: Specifies namespace in destination cluster (optional) type: string type: object + defaultNamespace: + description: Specifies the default namespace to install the Package resources, by default this is same as the PackageInstall namespace (optional; v0.48.0+) + type: string noopDelete: description: When NoopDelete set to true, PackageInstall deletion should delete PackageInstall/App CR but preserve App's associated resources. type: boolean diff --git a/hack/dependencies.yml b/hack/dependencies.yml index 80791b2a41..17e4e61158 100644 --- a/hack/dependencies.yml +++ b/hack/dependencies.yml @@ -22,18 +22,19 @@ repo: vmware-tanzu/carvel-kbld urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} version: v0.37.4 +# To be updated after official kapp release - checksums: darwin: - amd64: e71048d2b11a2c10258079cc134d7d2c2b6584429202a6212306380d3a8c0a30 - arm64: 3660dd8efe83c1356e05255307fa6f65825ba694d96b93bc38c6a43d7e6d7a8c + amd64: 1fee9ff094dfc6750f879df6c111048d20392931d03a41d6c7f68d5db3d05e2d + arm64: c2c61530fbcb8812001338eb5c2c41289f810efc5aafb957ff21ac7611d0d9e4 linux: - amd64: b253ea9cf6add07f9497955147dc12e8612c24c36dc9929c9a4fecdc76752bd3 - arm64: 25491298f6783a8b337d2ebdecf749f7750cf10260fe37086315a9c7da0b558f + amd64: f70119163d84b188b818ea7cdf6a88b4482e4e51248d30593a0b47399a1657e6 + arm64: b1efb38cbc93630e377e74203e64f90b8cdffab2ff2e24c2365baec179a05e3b dev: true name: kapp - repo: vmware-tanzu/carvel-kapp - urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} - version: v0.58.0 + repo: praveenrewar/kapp + urlTemplate: https://github.com/praveenrewar/{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} + version: v0.58.0-alpha2 - checksums: darwin: amd64: 6a5290066d8fbe26aa0603902825bbca55b97f011e97949677eb937ace2d2e3e diff --git a/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/pkg/apis/kappctrl/v1alpha1/generated.pb.go index cfac16db25..772f7cff0d 100644 --- a/pkg/apis/kappctrl/v1alpha1/generated.pb.go +++ b/pkg/apis/kappctrl/v1alpha1/generated.pb.go @@ -1113,166 +1113,167 @@ func init() { } var fileDescriptor_e972ccf085273df7 = []byte{ - // 2535 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7, - 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, + // 2558 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x5d, 0x8c, 0x1b, 0x57, + 0x15, 0xce, 0xac, 0xbd, 0xeb, 0xf5, 0xd9, 0x9f, 0x6c, 0x6e, 0xb2, 0xd4, 0x2c, 0x74, 0x1d, 0x4d, + 0xa5, 0xaa, 0x11, 0xc4, 0x56, 0x56, 0x69, 0x88, 0x40, 0x42, 0x5a, 0xef, 0x66, 0x37, 0x9b, 0xcd, + 0x26, 0xd6, 0xf5, 0x26, 0x34, 0x85, 0x36, 0x1d, 0x8f, 0xef, 0xda, 0x83, 0xc7, 0x33, 0xc3, 0xcc, + 0x1d, 0x67, 0x5d, 0x15, 0x09, 0x0a, 0x42, 0x85, 0x22, 0x11, 0x21, 0xb5, 0x20, 0x90, 0x78, 0x41, + 0xe2, 0x1d, 0xc1, 0x23, 0x2f, 0x88, 0x97, 0x48, 0x08, 0xa9, 0x52, 0x5f, 0xca, 0x8b, 0x21, 0xe6, + 0x89, 0x47, 0xd4, 0xb7, 0x3e, 0xa1, 0xfb, 0x33, 0x7f, 0xb6, 0x37, 0x5e, 0xa4, 0x9d, 0x34, 0x95, + 0x78, 0x9b, 0x39, 0xe7, 0xdc, 0xf3, 0x9d, 0x7b, 0xee, 0xbd, 0xe7, 0x9c, 0x7b, 0x66, 0xe0, 0x5e, + 0xd3, 0xa0, 0x2d, 0xbf, 0x5e, 0xd2, 0xed, 0x4e, 0xb9, 0xdb, 0x79, 0xa0, 0xb9, 0xe4, 0x22, 0xd5, + 0xac, 0x37, 0xfd, 0xb2, 0xae, 0xb9, 0x5d, 0x62, 0x5e, 0x6c, 0x6b, 0x8e, 0x73, 0x51, 0xb7, 0x2d, + 0xea, 0xda, 0xa6, 0x49, 0xdc, 0xb2, 0xd3, 0x6e, 0x96, 0x35, 0xc7, 0xf0, 0xca, 0x8c, 0xa1, 0x53, + 0xd7, 0x2c, 0x77, 0x2f, 0x69, 0xa6, 0xd3, 0xd2, 0x2e, 0x95, 0x9b, 0xc4, 0x22, 0xae, 0x46, 0x49, + 0xa3, 0xe4, 0xb8, 0x36, 0xb5, 0xd1, 0x4e, 0xa4, 0xba, 0x24, 0x54, 0xdf, 0xe7, 0xaa, 0x4b, 0x42, + 0xf5, 0x7d, 0xa6, 0xe1, 0x7e, 0xa4, 0xba, 0xe4, 0xb4, 0x9b, 0x25, 0xa6, 0xba, 0x14, 0xa8, 0x2e, + 0x05, 0xaa, 0x57, 0x2e, 0xc6, 0xac, 0x6c, 0xda, 0x4d, 0xbb, 0xcc, 0x11, 0xea, 0xfe, 0x01, 0x7f, + 0xe3, 0x2f, 0xfc, 0x49, 0x20, 0xaf, 0xe0, 0x09, 0x93, 0xea, 0x12, 0xab, 0x61, 0x88, 0xb9, 0xc8, + 0xc7, 0x2e, 0x71, 0x3d, 0xc3, 0xb6, 0xbc, 0x23, 0x67, 0xb3, 0x72, 0xb9, 0x7d, 0xd5, 0x2b, 0x19, + 0x36, 0x9b, 0x7c, 0x47, 0xd3, 0x5b, 0x86, 0x45, 0xdc, 0x5e, 0xe4, 0x8d, 0x0e, 0xa1, 0x5a, 0xb9, + 0x3b, 0x3a, 0xaa, 0x7c, 0xd4, 0x28, 0xd7, 0xb7, 0xa8, 0xd1, 0x21, 0x23, 0x03, 0xae, 0x4c, 0x1a, + 0xe0, 0xe9, 0x2d, 0xd2, 0xd1, 0x86, 0xc7, 0xa9, 0x1f, 0x2b, 0x00, 0xeb, 0x8e, 0xb3, 0x61, 0xfa, + 0x1e, 0x25, 0x2e, 0x2a, 0x43, 0xde, 0xd2, 0x3a, 0xc4, 0x73, 0x34, 0x9d, 0x14, 0x94, 0xf3, 0xca, + 0x4b, 0xf9, 0xca, 0x99, 0x47, 0xfd, 0xe2, 0xa9, 0x41, 0xbf, 0x98, 0xbf, 0x15, 0x30, 0x70, 0x24, + 0x83, 0xfe, 0xa0, 0xc0, 0xd9, 0xb6, 0x5f, 0x27, 0xba, 0x6d, 0x1d, 0x18, 0xcd, 0x1a, 0xd1, 0x5d, + 0x42, 0x31, 0x39, 0x28, 0x4c, 0x9d, 0x57, 0x5e, 0x9a, 0x5b, 0x6b, 0x95, 0x4e, 0x6c, 0x2d, 0x4b, + 0x91, 0x95, 0xbb, 0xa3, 0x78, 0x95, 0xe7, 0x06, 0xfd, 0xe2, 0xd9, 0x31, 0x0c, 0x3c, 0xce, 0x3a, + 0xf5, 0x0d, 0x78, 0xfe, 0x89, 0xea, 0xd0, 0x79, 0xc8, 0xb2, 0x39, 0x4a, 0x17, 0xcc, 0x4b, 0x17, + 0x64, 0x99, 0x0b, 0x30, 0xe7, 0xa0, 0xe7, 0x21, 0xd3, 0x26, 0x3d, 0x3e, 0xcf, 0x7c, 0x65, 0x4e, + 0x0a, 0x64, 0x76, 0x49, 0x0f, 0x33, 0xba, 0xfa, 0x03, 0x05, 0xf2, 0xeb, 0x8e, 0xb3, 0x49, 0x1c, + 0xd3, 0xee, 0xa1, 0x2e, 0x64, 0xd9, 0x84, 0xb8, 0xba, 0xb9, 0xb5, 0x57, 0x4e, 0xd6, 0x2b, 0x02, + 0x63, 0x57, 0x73, 0x9c, 0xca, 0x2c, 0x33, 0x92, 0x3d, 0x61, 0x8e, 0xa7, 0xbe, 0x9f, 0x81, 0x85, + 0x84, 0x04, 0x7a, 0x11, 0x66, 0x0c, 0x8b, 0xda, 0xb7, 0x3c, 0x39, 0xb5, 0x45, 0x69, 0xf9, 0xcc, + 0x0e, 0xa7, 0x62, 0xc9, 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, 0xed, 0x5f, 0xc8, 0x70, 0xa9, 0xc5, 0x41, 0xbf, 0x08, 0x38, 0xa4, 0xe2, + 0x98, 0x04, 0xfa, 0x91, 0x02, 0x39, 0xc3, 0xf2, 0x1c, 0xa2, 0xd3, 0x42, 0x96, 0xbb, 0xe1, 0x7e, + 0x5a, 0x6e, 0xd8, 0x11, 0x30, 0x95, 0xb9, 0x41, 0xbf, 0x98, 0x93, 0x2f, 0x38, 0x00, 0x47, 0x6f, + 0x2b, 0x30, 0xd3, 0x20, 0x26, 0xa1, 0xa4, 0x30, 0xcd, 0xed, 0x78, 0x3d, 0x2d, 0x3b, 0x36, 0x39, + 0x4a, 0x05, 0x98, 0x7b, 0xc5, 0x33, 0x96, 0xc8, 0xea, 0x35, 0x38, 0x3b, 0x46, 0x74, 0xc8, 0xa9, + 0xca, 0x24, 0xa7, 0xaa, 0x5b, 0x70, 0x6e, 0xdc, 0xcc, 0xff, 0x67, 0x3d, 0x7f, 0x9c, 0x81, 0xd9, + 0x75, 0xc7, 0xd9, 0x22, 0x54, 0x6f, 0xa1, 0xef, 0xb2, 0x2d, 0x62, 0x1a, 0x16, 0x91, 0xdb, 0xf5, + 0xde, 0xc9, 0xfa, 0x87, 0x83, 0xec, 0x70, 0x00, 0xe1, 0x1a, 0xf1, 0x8c, 0x25, 0x28, 0xea, 0xc1, + 0xb4, 0xd1, 0xd1, 0x9a, 0x44, 0x86, 0x90, 0x57, 0xd2, 0x40, 0x67, 0xfa, 0xc5, 0x9e, 0xe6, 0x8f, + 0x58, 0x20, 0x22, 0x1f, 0xb2, 0x2d, 0x4a, 0x9d, 0x42, 0x86, 0x23, 0x7f, 0x23, 0x05, 0xe4, 0xeb, + 0xfb, 0xfb, 0x55, 0x71, 0x4a, 0xd9, 0x13, 0xe6, 0x70, 0xe8, 0x3b, 0x90, 0x69, 0x1a, 0xc1, 0xa9, + 0xb8, 0x9b, 0x02, 0xea, 0xb6, 0x41, 0x2b, 0x39, 0x16, 0x9e, 0xb6, 0x0d, 0x8a, 0x19, 0x16, 0xfa, + 0xb1, 0x02, 0xf9, 0x16, 0x31, 0x3b, 0x1b, 0x2d, 0xcd, 0xa5, 0xf2, 0x1c, 0x7c, 0x2b, 0x8d, 0xf9, + 0x06, 0x18, 0x95, 0x05, 0x96, 0x42, 0xc2, 0x57, 0x1c, 0xa1, 0xa3, 0xf7, 0x14, 0x98, 0x37, 0x3a, + 0x4d, 0xa7, 0xdd, 0xac, 0xf8, 0x56, 0xc3, 0x24, 0x85, 0x99, 0x34, 0xc2, 0x83, 0x5c, 0xf8, 0x08, + 0xa6, 0xb2, 0x34, 0xe8, 0x17, 0xe7, 0xe3, 0x14, 0x9c, 0x30, 0x83, 0xe5, 0x00, 0x47, 0xa3, 0xad, + 0x42, 0x2e, 0x99, 0x03, 0xaa, 0x1a, 0x6d, 0x61, 0xce, 0x51, 0xff, 0x9a, 0x81, 0xb9, 0x98, 0x8f, + 0x59, 0x4e, 0xf0, 0x5d, 0x53, 0x46, 0xd6, 0x30, 0x27, 0xdc, 0xc1, 0x37, 0x31, 0xa3, 0x33, 0xb6, + 0x2b, 0x53, 0x63, 0x8c, 0xcd, 0x92, 0x14, 0xa3, 0xa3, 0x9f, 0x28, 0x30, 0xef, 0x92, 0x83, 0x1a, + 0x31, 0x89, 0xce, 0x8e, 0xa5, 0xf4, 0xc3, 0xfe, 0x24, 0x3f, 0x88, 0x52, 0x84, 0x4f, 0x5f, 0x3e, + 0x06, 0x55, 0x49, 0xe4, 0x80, 0xbb, 0x82, 0x12, 0xea, 0x16, 0x93, 0xc7, 0x31, 0x34, 0x9c, 0xc0, + 0x46, 0xef, 0x28, 0x90, 0xf7, 0xc2, 0x6c, 0x2e, 0x0e, 0xc4, 0x37, 0x53, 0x58, 0x91, 0x9b, 0xb6, + 0xae, 0x99, 0x2c, 0x81, 0xf3, 0xfd, 0x11, 0xa5, 0xed, 0x08, 0x1c, 0x5d, 0x80, 0x9c, 0xe7, 0xd7, + 0x99, 0xdb, 0xf9, 0x11, 0xc9, 0x57, 0x4e, 0x4b, 0xd7, 0xe5, 0x6a, 0x82, 0x8c, 0x03, 0x3e, 0xfa, + 0x1a, 0x2c, 0x98, 0x07, 0x5e, 0xad, 0x6d, 0x38, 0xb5, 0x8e, 0xdf, 0x68, 0x8a, 0x08, 0x3f, 0x5b, + 0x59, 0x96, 0x03, 0x16, 0x6e, 0x6e, 0xd5, 0x22, 0x26, 0x4e, 0xca, 0xaa, 0xef, 0x4e, 0xc1, 0x7c, + 0xfc, 0x9c, 0x4e, 0x5a, 0xce, 0x17, 0x61, 0xc6, 0x6b, 0x69, 0x6b, 0x2f, 0x5f, 0x91, 0x2b, 0x1a, + 0xa6, 0xd2, 0xda, 0xf5, 0xf5, 0xb5, 0x97, 0xaf, 0x60, 0xc9, 0xfd, 0x6c, 0xba, 0x92, 0x15, 0x86, + 0x67, 0x46, 0x4e, 0xf1, 0x31, 0xea, 0xa2, 0x0b, 0x90, 0x93, 0xdb, 0x4f, 0xba, 0x25, 0x84, 0x90, + 0x7b, 0x10, 0x07, 0x7c, 0xf4, 0x50, 0x01, 0x70, 0x89, 0x63, 0x7b, 0x06, 0xb5, 0xdd, 0x9e, 0xf4, + 0xcc, 0x1b, 0x69, 0x46, 0x21, 0x4c, 0x1c, 0x5b, 0x26, 0xc2, 0x10, 0x17, 0xc7, 0x6c, 0x50, 0xff, + 0xac, 0xc0, 0xf2, 0xd8, 0x51, 0x93, 0x36, 0x43, 0x72, 0x91, 0xa7, 0x3e, 0xc5, 0x45, 0x56, 0xff, + 0x33, 0xc5, 0x8b, 0xbe, 0x28, 0xd3, 0x4d, 0xb2, 0x9d, 0x05, 0x1e, 0xaa, 0x35, 0xa3, 0xc0, 0x93, + 0x4d, 0x3b, 0xf0, 0xec, 0xc7, 0xd0, 0x70, 0x02, 0xfb, 0x19, 0x72, 0x64, 0xfc, 0xb4, 0x64, 0x26, + 0x9c, 0x96, 0x0f, 0xa7, 0x78, 0x25, 0x36, 0x92, 0x64, 0xd0, 0x0b, 0x41, 0x35, 0x23, 0x9c, 0xbf, + 0x20, 0x35, 0x24, 0xeb, 0x8e, 0x91, 0x05, 0xc8, 0xfc, 0x7f, 0x01, 0xd8, 0x4e, 0xfe, 0xf7, 0x14, + 0x2c, 0x26, 0x2b, 0x46, 0x56, 0xb8, 0x4c, 0xb3, 0xdc, 0x2b, 0xaa, 0xda, 0xb9, 0xb5, 0x46, 0x6a, + 0xc5, 0x69, 0x89, 0x2d, 0xac, 0x77, 0xcd, 0xa2, 0x6e, 0x2f, 0x5a, 0x36, 0x4e, 0xc3, 0xc2, 0x02, + 0x16, 0xbf, 0xf2, 0xfc, 0x69, 0xcb, 0xb5, 0x3b, 0xfc, 0xa2, 0x94, 0x52, 0xd5, 0xc2, 0xed, 0xa9, + 0xd9, 0xbe, 0xab, 0x93, 0xe8, 0x3a, 0x5e, 0x0d, 0x90, 0x71, 0x64, 0xc4, 0xca, 0x55, 0x80, 0xc8, + 0x6c, 0xb4, 0x24, 0xee, 0xa8, 0x7c, 0xeb, 0xf1, 0x6b, 0x29, 0x3a, 0x07, 0xd3, 0x5d, 0xcd, 0xf4, + 0x45, 0x71, 0x9d, 0xc7, 0xe2, 0xe5, 0xab, 0x53, 0x57, 0x15, 0xf5, 0x2f, 0xf1, 0x1d, 0x1c, 0x03, + 0x44, 0x3f, 0x4b, 0xec, 0x07, 0x71, 0x25, 0xa8, 0xa7, 0x3c, 0xcb, 0x27, 0x9f, 0xcb, 0x5f, 0x2a, + 0x30, 0x2f, 0x2e, 0xec, 0x7b, 0x9a, 0x13, 0x6d, 0xd2, 0xa7, 0x61, 0x14, 0x3f, 0x3c, 0x1b, 0x31, + 0x6c, 0x9c, 0xb0, 0x44, 0x3d, 0x84, 0xe7, 0x8e, 0x18, 0xca, 0x6a, 0x93, 0x86, 0xe1, 0x12, 0x9d, + 0xe5, 0x19, 0x1e, 0x53, 0x44, 0x7a, 0x0c, 0x6b, 0x93, 0xcd, 0x38, 0x13, 0x27, 0x65, 0x27, 0xe7, + 0x5d, 0xf5, 0x32, 0x2c, 0x0d, 0x9f, 0xac, 0x63, 0x8c, 0x7a, 0x3b, 0x07, 0xb9, 0x75, 0xc7, 0xa9, + 0x39, 0x44, 0x47, 0x37, 0x00, 0x79, 0xc4, 0xed, 0x1a, 0x3a, 0x59, 0xd7, 0x75, 0xdb, 0xb7, 0xe8, + 0xad, 0x68, 0xec, 0x8a, 0x1c, 0x8b, 0x6a, 0x23, 0x12, 0x78, 0xcc, 0x28, 0xf4, 0x16, 0xe4, 0x74, + 0xd1, 0x5d, 0x91, 0x8b, 0x73, 0x27, 0x95, 0x4e, 0x90, 0xb8, 0xe2, 0xcb, 0x17, 0x1c, 0x40, 0xa2, + 0x43, 0x98, 0x3e, 0x60, 0x8e, 0xe0, 0x6d, 0x89, 0xb9, 0xb5, 0x5a, 0x0a, 0x1b, 0x23, 0x0a, 0x09, + 0xfc, 0x15, 0x0b, 0x40, 0xf4, 0x43, 0x05, 0x66, 0x29, 0xe9, 0x38, 0xa6, 0x46, 0x49, 0x21, 0xcb, + 0xd1, 0x4f, 0xf8, 0x42, 0xb7, 0x2f, 0xb5, 0x57, 0x96, 0xa4, 0x01, 0xb3, 0x01, 0x05, 0x87, 0xc8, + 0xe8, 0x2d, 0x98, 0x69, 0xf0, 0xa6, 0x40, 0x61, 0x9a, 0xdb, 0xb0, 0x9f, 0x46, 0x8b, 0x23, 0x2a, + 0x78, 0xc5, 0x3b, 0x96, 0x98, 0xac, 0x30, 0x76, 0x34, 0xdf, 0x23, 0x0d, 0x7e, 0x83, 0x99, 0x8d, + 0xe4, 0xaa, 0x9c, 0x8a, 0x25, 0x17, 0x7d, 0x19, 0x66, 0x75, 0xcd, 0xd2, 0x89, 0x49, 0x1a, 0xfc, + 0x92, 0x35, 0x1b, 0xcd, 0x69, 0x43, 0xd2, 0x71, 0x28, 0x81, 0x5e, 0x07, 0xf0, 0x7a, 0x96, 0x5e, + 0x25, 0xae, 0x61, 0x37, 0x0a, 0xb3, 0x7c, 0x57, 0x95, 0x4a, 0xa2, 0xed, 0x59, 0x8a, 0xb7, 0x3d, + 0x23, 0xe3, 0x3b, 0x84, 0x6a, 0xa5, 0xee, 0xa5, 0xd2, 0xa6, 0xef, 0x6a, 0x3c, 0xf7, 0xf1, 0xd2, + 0xaf, 0x16, 0x6a, 0xc1, 0x31, 0x8d, 0x68, 0x0d, 0xc0, 0xb2, 0x6d, 0xd9, 0x89, 0x29, 0xe4, 0xb9, + 0x3d, 0x48, 0xda, 0x03, 0xb7, 0x42, 0x0e, 0x8e, 0x49, 0xa1, 0x4d, 0x58, 0x6a, 0x90, 0x03, 0xcd, + 0x37, 0x69, 0xd8, 0x1c, 0x2d, 0x00, 0x3f, 0x30, 0x05, 0x39, 0x72, 0x69, 0x73, 0x88, 0x8f, 0x47, + 0x46, 0xa8, 0xbf, 0xc9, 0xf1, 0x6b, 0x64, 0xb0, 0x8e, 0x88, 0x42, 0xa6, 0x47, 0x69, 0x3a, 0xdd, + 0x97, 0x00, 0xe4, 0x1e, 0x95, 0x2d, 0x81, 0x7b, 0x94, 0x62, 0x06, 0x87, 0x0e, 0x21, 0xdb, 0xae, + 0x9b, 0x0d, 0x79, 0x5e, 0x5f, 0x4d, 0x07, 0x76, 0xb7, 0x6e, 0x36, 0x64, 0x97, 0xb2, 0x6e, 0x36, + 0x30, 0x47, 0xe4, 0xf1, 0xbc, 0x45, 0xcc, 0x4e, 0x20, 0x24, 0xcb, 0x9f, 0x7a, 0x3a, 0x26, 0x5c, + 0x8f, 0x21, 0x89, 0x78, 0x1e, 0xa7, 0xe0, 0x84, 0x25, 0xe8, 0xa7, 0x0a, 0xe4, 0xdb, 0xbe, 0x47, + 0xed, 0x8e, 0xf1, 0x26, 0x49, 0xa7, 0x6f, 0x19, 0xba, 0x26, 0x80, 0x11, 0x99, 0x2f, 0x7c, 0xc5, + 0x91, 0x01, 0x2c, 0xbc, 0xe4, 0xbe, 0xed, 0xd9, 0x96, 0x45, 0x82, 0xa6, 0xcd, 0x6b, 0xe9, 0x18, + 0x73, 0x43, 0x80, 0x88, 0xf8, 0x2a, 0x5f, 0x70, 0x00, 0xcd, 0xb6, 0x8a, 0x67, 0x3b, 0x9e, 0x6c, + 0x50, 0xa4, 0xb4, 0x55, 0x6a, 0xb6, 0xe3, 0x89, 0xad, 0xc2, 0x9e, 0x30, 0x47, 0x64, 0x47, 0x43, + 0xf7, 0x09, 0x8f, 0x16, 0xa9, 0x1d, 0x8d, 0x0d, 0x9f, 0x88, 0xa3, 0xb1, 0xe1, 0x13, 0xcc, 0xe0, + 0x58, 0x75, 0xbf, 0x98, 0x14, 0x40, 0xc5, 0x78, 0x19, 0x2a, 0xfb, 0xe3, 0x89, 0xe2, 0xf0, 0x7d, + 0x05, 0x80, 0x57, 0x57, 0xf1, 0xea, 0x30, 0xa5, 0x2d, 0x7d, 0x97, 0xe3, 0xc8, 0x02, 0x31, 0x8c, + 0x59, 0x77, 0x43, 0x74, 0x1c, 0xb3, 0x04, 0xad, 0xc3, 0x69, 0xc3, 0x72, 0x7c, 0x7a, 0xed, 0xd0, + 0x71, 0x89, 0xe7, 0x05, 0xd7, 0x8d, 0x7c, 0xe5, 0x39, 0x39, 0xf0, 0xf4, 0x4e, 0x92, 0x8d, 0x87, + 0xe5, 0x59, 0xd8, 0xb3, 0x7d, 0x9a, 0xd4, 0x91, 0x4d, 0x86, 0xbd, 0xdb, 0x43, 0x7c, 0x3c, 0x32, + 0x42, 0xfd, 0x7b, 0x96, 0x17, 0x4b, 0xe3, 0xce, 0xe5, 0x31, 0xfa, 0x0c, 0x89, 0x2f, 0x55, 0x53, + 0xc7, 0xf8, 0x52, 0x15, 0xb4, 0xf3, 0x32, 0x47, 0xb5, 0xf3, 0x86, 0x97, 0x2c, 0xfb, 0xcc, 0x2c, + 0xd9, 0x2f, 0x14, 0x38, 0xd3, 0xf6, 0xeb, 0xc4, 0xb5, 0x08, 0x25, 0x9e, 0xbc, 0xd1, 0xc9, 0x00, + 0x80, 0x4f, 0xd0, 0x3e, 0xa9, 0xb9, 0xb2, 0x3c, 0xe8, 0x17, 0xcf, 0xec, 0x0e, 0x03, 0xe2, 0x51, + 0x1b, 0xd0, 0x7b, 0x0a, 0x2c, 0x46, 0xd4, 0xf5, 0xea, 0x4e, 0x10, 0x14, 0x4e, 0xf2, 0x6c, 0xee, + 0x26, 0x00, 0x2a, 0x68, 0xd0, 0x2f, 0x2e, 0x26, 0x69, 0x78, 0xc8, 0x08, 0xf5, 0x1c, 0xa0, 0xd1, + 0x68, 0xa6, 0xae, 0xc1, 0xe9, 0xa1, 0x5c, 0x34, 0xf1, 0x1c, 0xab, 0x9f, 0xe3, 0xd7, 0xa2, 0x91, + 0x20, 0xad, 0xfe, 0x6e, 0x2a, 0xa1, 0x8c, 0xc5, 0x28, 0x74, 0x08, 0x19, 0xa7, 0x19, 0x7c, 0xe5, + 0x7b, 0x2d, 0xbd, 0xb0, 0x58, 0xdd, 0xae, 0x8a, 0x08, 0x55, 0xdd, 0xae, 0x62, 0x06, 0x19, 0x4d, + 0x63, 0xea, 0x88, 0x70, 0x74, 0x08, 0x19, 0xad, 0x19, 0x64, 0xd6, 0x14, 0x4d, 0x5b, 0x6f, 0xca, + 0xe0, 0xb9, 0xde, 0x24, 0x98, 0x41, 0xaa, 0x1f, 0x2a, 0x89, 0xb5, 0x90, 0x42, 0xe8, 0x4f, 0x0a, + 0x9c, 0x73, 0x5c, 0xa3, 0xcb, 0x9c, 0x4a, 0x7a, 0x5e, 0x6d, 0xe8, 0x86, 0x69, 0xa5, 0xe8, 0xbd, + 0x31, 0xa8, 0x95, 0xc2, 0xa0, 0x5f, 0x3c, 0x37, 0x8e, 0x83, 0xc7, 0x5a, 0x39, 0x6e, 0x56, 0xd5, + 0xed, 0xea, 0x67, 0x7d, 0x56, 0xdb, 0xf0, 0xc2, 0x31, 0xd4, 0x1e, 0xe3, 0x5e, 0xf9, 0x7b, 0x05, + 0xbe, 0x38, 0x12, 0xed, 0x36, 0xed, 0x07, 0xd6, 0x03, 0xcd, 0x6d, 0xac, 0x57, 0x77, 0xd0, 0x43, + 0x05, 0xa6, 0x0d, 0x4a, 0x3a, 0x41, 0x1f, 0xa7, 0x9d, 0x66, 0x98, 0x8d, 0x01, 0xef, 0x50, 0xd2, + 0x89, 0x75, 0xe1, 0x98, 0x05, 0x58, 0x18, 0xa2, 0xfe, 0x2d, 0x0b, 0xe7, 0x27, 0x0d, 0x3d, 0x5e, + 0x62, 0x3a, 0x30, 0x88, 0xd9, 0x88, 0xdd, 0xf1, 0xc3, 0xc4, 0xb4, 0x15, 0x30, 0x70, 0x24, 0x73, + 0x44, 0x74, 0xcf, 0x3c, 0x03, 0xd1, 0xfd, 0xb7, 0x0a, 0x2c, 0x33, 0x3d, 0x1b, 0xa1, 0xfe, 0xc0, + 0xba, 0x6c, 0x6a, 0xd6, 0x7d, 0x7e, 0xd0, 0x2f, 0x2e, 0xef, 0x8e, 0x03, 0xc5, 0xe3, 0x6d, 0x19, + 0x97, 0x83, 0xa6, 0x9f, 0x85, 0x1c, 0xf4, 0x6e, 0xb2, 0xbe, 0x89, 0x67, 0x7c, 0xf4, 0xf3, 0x31, + 0x4d, 0x35, 0x92, 0x7e, 0xa5, 0xf1, 0xe4, 0xbe, 0xda, 0xaf, 0xc7, 0xf7, 0xd5, 0x9e, 0x92, 0x5d, + 0x13, 0x5a, 0x6b, 0xc7, 0xa8, 0xdf, 0x7e, 0xa5, 0xc0, 0x5c, 0x23, 0x3a, 0xaf, 0x72, 0x93, 0x36, + 0x9f, 0x52, 0x64, 0xa9, 0x9c, 0x1e, 0xf4, 0x8b, 0x73, 0x31, 0x02, 0x8e, 0x1b, 0xa3, 0x7e, 0x1d, + 0x56, 0x8e, 0x9e, 0xfc, 0x31, 0x22, 0xea, 0xc7, 0x99, 0xc4, 0x1d, 0xe4, 0x1e, 0xa5, 0xa8, 0x06, + 0xcb, 0x46, 0xd3, 0xb2, 0x5d, 0x72, 0xc7, 0x6a, 0x5b, 0xf6, 0x03, 0x6b, 0xc3, 0xee, 0x74, 0x88, + 0x45, 0xc5, 0xaf, 0x3d, 0xb3, 0x95, 0xe7, 0xa5, 0x96, 0xe5, 0x9d, 0x71, 0x42, 0x78, 0xfc, 0x58, + 0xfe, 0x55, 0x93, 0xba, 0x86, 0x4e, 0xf9, 0xea, 0xc7, 0x9a, 0x37, 0x35, 0x4e, 0xc5, 0x92, 0x1b, + 0xfb, 0x4b, 0x24, 0xf3, 0x69, 0xfc, 0x25, 0x12, 0x16, 0x3c, 0xd9, 0x23, 0x0a, 0x9e, 0x2f, 0xb1, + 0x30, 0x6c, 0x92, 0x3d, 0xcd, 0x6d, 0x7b, 0xbc, 0x0b, 0x96, 0x17, 0x3b, 0x7f, 0x2b, 0x20, 0xe2, + 0x88, 0x3f, 0x5c, 0xf9, 0xcf, 0x3c, 0x2b, 0x95, 0xbf, 0xfa, 0x0f, 0x05, 0xf2, 0x1b, 0xb6, 0xd5, + 0x30, 0xf8, 0xa7, 0x99, 0x4b, 0x90, 0xa5, 0x3d, 0x27, 0xd8, 0x25, 0xc1, 0xfa, 0x66, 0xf7, 0x7b, + 0x0e, 0xf9, 0xa4, 0x5f, 0x5c, 0x08, 0x05, 0x19, 0x01, 0x73, 0x51, 0x74, 0x93, 0x2d, 0xa7, 0x46, + 0x7d, 0x4f, 0xa6, 0xa2, 0xcb, 0xd1, 0x72, 0x32, 0xea, 0x27, 0xfd, 0xa2, 0x1a, 0xfd, 0x39, 0x58, + 0xd6, 0x6d, 0x97, 0x94, 0xbb, 0x97, 0x4a, 0xa1, 0x26, 0x21, 0x85, 0xa5, 0x0e, 0xb6, 0x39, 0x5c, + 0xa2, 0x79, 0xe1, 0x95, 0x31, 0xdc, 0x1c, 0x98, 0x53, 0xb1, 0xe4, 0xa2, 0x0b, 0x90, 0xeb, 0x10, + 0xcf, 0x63, 0x15, 0xe7, 0xd0, 0x77, 0xe6, 0x3d, 0x41, 0xc6, 0x01, 0x5f, 0xfd, 0x7e, 0x06, 0x16, + 0xb6, 0x89, 0x45, 0x5c, 0x43, 0x17, 0x60, 0xe8, 0x06, 0x20, 0xbb, 0xee, 0x11, 0xb7, 0x4b, 0x1a, + 0xdb, 0xe2, 0x6f, 0x45, 0x96, 0x71, 0xd8, 0x9c, 0x33, 0x51, 0x1f, 0xfa, 0xf6, 0x88, 0x04, 0x1e, + 0x33, 0x0a, 0xbd, 0xa3, 0x00, 0xe8, 0xc1, 0x64, 0x3c, 0x79, 0x0b, 0x3f, 0xc9, 0x6e, 0x68, 0xe8, + 0xa9, 0x68, 0x29, 0x43, 0x92, 0x87, 0x63, 0xd8, 0x68, 0x0f, 0xce, 0x1e, 0xb8, 0x06, 0xb1, 0x1a, + 0x66, 0x6f, 0x93, 0x78, 0xba, 0x6b, 0x38, 0x34, 0xba, 0x7b, 0x7f, 0x41, 0x0e, 0x3e, 0xbb, 0x35, + 0x2a, 0x82, 0xc7, 0x8d, 0x63, 0x5e, 0xf2, 0x3d, 0x72, 0xe0, 0x9b, 0xd7, 0x5c, 0xd7, 0x76, 0xf7, + 0x12, 0xde, 0x0e, 0xbd, 0x74, 0x67, 0x44, 0x02, 0x8f, 0x19, 0xa5, 0xee, 0xc0, 0x50, 0x2e, 0x43, + 0x5f, 0x81, 0x85, 0xa6, 0x6b, 0xfb, 0x8e, 0xcc, 0xb1, 0xc1, 0xf5, 0xe8, 0xcc, 0xa0, 0x5f, 0x5c, + 0xd8, 0x8e, 0x33, 0x70, 0x52, 0x4e, 0xbd, 0x0c, 0xc1, 0x77, 0xfe, 0xf8, 0x9f, 0x00, 0xca, 0x93, + 0xff, 0x04, 0xa8, 0xd8, 0x8f, 0x1e, 0xaf, 0x9e, 0xfa, 0xe0, 0xf1, 0xea, 0xa9, 0x8f, 0x1e, 0xaf, + 0x9e, 0xfa, 0xde, 0x60, 0x55, 0x79, 0x34, 0x58, 0x55, 0x3e, 0x18, 0xac, 0x2a, 0x1f, 0x0d, 0x56, + 0x95, 0x7f, 0x0e, 0x56, 0x95, 0x87, 0xff, 0x5a, 0x3d, 0xf5, 0xea, 0xce, 0x89, 0xfd, 0x73, 0xfc, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xaf, 0xd1, 0x04, 0xbf, 0x2c, 0x00, 0x00, } func (m *AppCluster) Marshal() (dAtA []byte, err error) { @@ -2120,6 +2121,11 @@ func (m *AppSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.DefaultNamespace) + copy(dAtA[i:], m.DefaultNamespace) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.DefaultNamespace))) + i-- + dAtA[i] = 0x52 i-- if m.NoopDelete { dAtA[i] = 1 @@ -3487,6 +3493,8 @@ func (m *AppSpec) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } n += 2 + l = len(m.DefaultNamespace) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -4095,6 +4103,7 @@ func (this *AppSpec) String() string { `Canceled:` + fmt.Sprintf("%v", this.Canceled) + `,`, `SyncPeriod:` + strings.Replace(fmt.Sprintf("%v", this.SyncPeriod), "Duration", "v1.Duration", 1) + `,`, `NoopDelete:` + fmt.Sprintf("%v", this.NoopDelete) + `,`, + `DefaultNamespace:` + fmt.Sprintf("%v", this.DefaultNamespace) + `,`, `}`, }, "") return s @@ -7204,6 +7213,38 @@ func (m *AppSpec) Unmarshal(dAtA []byte) error { } } m.NoopDelete = bool(v != 0) + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DefaultNamespace", 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.DefaultNamespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/pkg/apis/kappctrl/v1alpha1/generated.proto b/pkg/apis/kappctrl/v1alpha1/generated.proto index 751896e47d..4e1461e8fa 100644 --- a/pkg/apis/kappctrl/v1alpha1/generated.proto +++ b/pkg/apis/kappctrl/v1alpha1/generated.proto @@ -280,6 +280,11 @@ message AppSpec { // (optional; default=false; v0.18.0+) // +optional optional bool noopDelete = 9; + + // Specifies the default namespace to install the App resources, by default this is + // same as the App's namespace (optional; v0.48.0+) + // +optional + optional string defaultNamespace = 10; } // +k8s:openapi-gen=true diff --git a/pkg/apis/kappctrl/v1alpha1/types.go b/pkg/apis/kappctrl/v1alpha1/types.go index ead900af14..dc89189e4a 100644 --- a/pkg/apis/kappctrl/v1alpha1/types.go +++ b/pkg/apis/kappctrl/v1alpha1/types.go @@ -76,6 +76,10 @@ type AppSpec struct { // (optional; default=false; v0.18.0+) // +optional NoopDelete bool `json:"noopDelete,omitempty" protobuf:"varint,9,opt,name=noopDelete"` + // Specifies the default namespace to install the App resources, by default this is + // same as the App's namespace (optional; v0.48.0+) + // +optional + DefaultNamespace string `json:"defaultNamespace,omitempty" protobuf:"bytes,10,opt,name=defaultNamespace"` } // +k8s:openapi-gen=true diff --git a/pkg/apis/packaging/v1alpha1/package_install.go b/pkg/apis/packaging/v1alpha1/package_install.go index 5fa083aa93..0195b08409 100644 --- a/pkg/apis/packaging/v1alpha1/package_install.go +++ b/pkg/apis/packaging/v1alpha1/package_install.go @@ -75,6 +75,10 @@ type PackageInstallSpec struct { // associated resources. // +optional NoopDelete bool `json:"noopDelete,omitempty"` + // Specifies the default namespace to install the Package resources, by default this is + // same as the PackageInstall namespace (optional; v0.48.0+) + // +optional + DefaultNamespace string `json:"defaultNamespace,omitempty"` } type PackageRef struct { diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go index c524abf659..7a8dde6a21 100644 --- a/pkg/apiserver/openapi/zz_generated.openapi.go +++ b/pkg/apiserver/openapi/zz_generated.openapi.go @@ -1000,6 +1000,13 @@ func schema_pkg_apis_kappctrl_v1alpha1_AppSpec(ref common.ReferenceCallback) com Format: "", }, }, + "defaultNamespace": { + SchemaProps: spec.SchemaProps{ + Description: "Specifies the default namespace to install the App resources, by default this is same as the App's namespace (optional; v0.48.0+)", + Type: []string{"string"}, + Format: "", + }, + }, }, }, }, diff --git a/pkg/app/app_deploy.go b/pkg/app/app_deploy.go index ae5aa08b7a..6bfbd9deaa 100644 --- a/pkg/app/app_deploy.go +++ b/pkg/app/app_deploy.go @@ -146,7 +146,9 @@ func (a *App) trySaveMetadata(kapp *ctldep.Kapp) { func (a *App) newKapp(kapp v1alpha1.AppDeployKapp, cancelCh chan struct{}) (*ctldep.Kapp, error) { return a.deployFactory.NewKapp(kapp, a.app.Spec.ServiceAccountName, - a.app.Spec.Cluster, cancelCh, kubeconfig.AccessLocation{Name: a.app.Name, Namespace: a.app.Namespace}) + a.app.Spec.Cluster, cancelCh, kubeconfig.AccessLocation{Name: a.app.Name, Namespace: a.app.Namespace}, + a.app.Spec.DefaultNamespace, a.app.Namespace, + ) } type cancelCondition func(v1alpha1.App) bool diff --git a/pkg/componentinfo/component_info.go b/pkg/componentinfo/component_info.go index 23313dcab6..1641584426 100644 --- a/pkg/componentinfo/component_info.go +++ b/pkg/componentinfo/component_info.go @@ -50,7 +50,7 @@ func (ci *ComponentInfo) KubernetesVersion(serviceAccountName string, specCluste return ci.parseAndScrubVersion(v.String()) case specCluster != nil: - accessInfo, err := ci.clusterAccess.ClusterAccess(serviceAccountName, specCluster, kubeconfig.AccessLocation{Name: objMeta.Name, Namespace: objMeta.Namespace}) + accessInfo, err := ci.clusterAccess.ClusterAccess(serviceAccountName, specCluster, kubeconfig.AccessLocation{Name: objMeta.Name, Namespace: objMeta.Namespace}, "") if err != nil { return semver.Version{}, err } diff --git a/pkg/deploy/factory.go b/pkg/deploy/factory.go index 7954736682..862929c22c 100644 --- a/pkg/deploy/factory.go +++ b/pkg/deploy/factory.go @@ -36,21 +36,22 @@ func NewFactory(coreClient kubernetes.Interface, kubeconfig *kubeconfig.Kubeconf // NewKapp configures and returns a deployer of type Kapp func (f Factory) NewKapp(opts v1alpha1.AppDeployKapp, saName string, - clusterOpts *v1alpha1.AppCluster, cancelCh chan struct{}, location kubeconfig.AccessLocation) (*Kapp, error) { + clusterOpts *v1alpha1.AppCluster, cancelCh chan struct{}, location kubeconfig.AccessLocation, + defaultNamespace string, appNamespace string) (*Kapp, error) { - clusterAccess, err := f.kubeconfig.ClusterAccess(saName, clusterOpts, location) + clusterAccess, err := f.kubeconfig.ClusterAccess(saName, clusterOpts, location, defaultNamespace) if err != nil { return nil, err } const suffix string = ".app" return NewKapp(suffix, opts, clusterAccess, - f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner), nil + f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner, appNamespace), nil } // NewKappPrivileged is used for package repositories where users aren't required to provide // a service account, so it will install resources using its own privileges. -func (f Factory) NewKappPrivilegedForPackageRepository(opts v1alpha1.AppDeployKapp, clusterAccess kubeconfig.AccessInfo, cancelCh chan struct{}) (*Kapp, error) { +func (f Factory) NewKappPrivilegedForPackageRepository(opts v1alpha1.AppDeployKapp, clusterAccess kubeconfig.AccessInfo, cancelCh chan struct{}, appNamespace string) (*Kapp, error) { const suffix string = ".pkgr" @@ -61,7 +62,7 @@ func (f Factory) NewKappPrivilegedForPackageRepository(opts v1alpha1.AppDeployKa DangerousUsePodServiceAccount: true, } - return NewKapp(suffix, opts, kconfAccess, f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner), nil + return NewKapp(suffix, opts, kconfAccess, f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner, appNamespace), nil } func (f Factory) globalKappDeployRawOpts() []string { diff --git a/pkg/deploy/kapp.go b/pkg/deploy/kapp.go index 44f3f6966e..5618bab79b 100644 --- a/pkg/deploy/kapp.go +++ b/pkg/deploy/kapp.go @@ -34,6 +34,7 @@ type Kapp struct { cancelCh chan struct{} cmdRunner exec.CmdRunner appMeta *Meta + appNamespace string } var _ Deploy = &Kapp{} @@ -42,9 +43,9 @@ var _ Deploy = &Kapp{} // additional info from the larger app resource (e.g. service account, name, namespace) as genericOpts, // and a cancel channel that gets passed through to the exec call that runs kapp. func NewKapp(appSuffix string, opts v1alpha1.AppDeployKapp, clusterAccess kubeconfig.AccessInfo, - globalDeployRawOpts []string, cancelCh chan struct{}, cmdRunner exec.CmdRunner) *Kapp { + globalDeployRawOpts []string, cancelCh chan struct{}, cmdRunner exec.CmdRunner, appNamespace string) *Kapp { - return &Kapp{appSuffix, opts, clusterAccess, globalDeployRawOpts, cancelCh, cmdRunner, nil} + return &Kapp{appSuffix, opts, clusterAccess, globalDeployRawOpts, cancelCh, cmdRunner, nil, appNamespace} } // Deploy takes the output from templating, and the app name, @@ -62,7 +63,7 @@ func (a *Kapp) Deploy(tplOutput string, startedApplyingFunc func(), metadataFile := filepath.Join(tmpMetadataDir.Path(), "app-metadata.yml") - args, err := a.addDeployArgs([]string{"deploy", "--app-metadata-file-output", metadataFile, "--prev-app", a.oldManagedName(), "-f", "-"}) + args, err := a.addDeployArgs([]string{"deploy", "--app-metadata-file-output", metadataFile, "--prev-app", a.oldManagedName(), "-f", "-", "--app-namespace", a.appNamespace}) if err != nil { return exec.NewCmdRunResultWithErr(err) } @@ -89,7 +90,7 @@ func (a *Kapp) Deploy(tplOutput string, startedApplyingFunc func(), // Delete takes the app name, it shells out, running kapp delete ... func (a *Kapp) Delete(startedApplyingFunc func(), changedFunc func(exec.CmdRunResult)) exec.CmdRunResult { - args, err := a.addDeleteArgs([]string{"delete", "--prev-app", a.oldManagedName()}) + args, err := a.addDeleteArgs([]string{"delete", "--prev-app", a.oldManagedName(), "--app-namespace", a.appNamespace}) if err != nil { return exec.NewCmdRunResultWithErr(err) } @@ -119,6 +120,7 @@ func (a *Kapp) Inspect() exec.CmdRunResult { // TODO is there a better way to deal with this? "--filter", `{"not":{"resource":{"kinds":["PodMetrics"]}}}`, "--tty", + "--app-namespace", a.appNamespace, }) if err != nil { return exec.NewCmdRunResultWithErr(err) diff --git a/pkg/kubeconfig/kubeconfig.go b/pkg/kubeconfig/kubeconfig.go index f2d53635a7..7fbf5e6ea1 100644 --- a/pkg/kubeconfig/kubeconfig.go +++ b/pkg/kubeconfig/kubeconfig.go @@ -47,7 +47,7 @@ func NewKubeconfig(coreClient kubernetes.Interface, log logr.Logger) *Kubeconfig // ClusterAccess takes cluster info and a ServiceAccount Name, and returns a populated kubeconfig that can connect to a cluster. // if the saName is empty then you'll connect to a cluster via the clusterOpts inside the genericOpts, otherwise you'll use the specified SA. -func (k Kubeconfig) ClusterAccess(saName string, clusterOpts *v1alpha1.AppCluster, accessLocation AccessLocation) (AccessInfo, error) { +func (k Kubeconfig) ClusterAccess(saName string, clusterOpts *v1alpha1.AppCluster, accessLocation AccessLocation, preferredNamespace string) (AccessInfo, error) { var err error var clusterAccessInfo AccessInfo @@ -67,5 +67,9 @@ func (k Kubeconfig) ClusterAccess(saName string, clusterOpts *v1alpha1.AppCluste default: return AccessInfo{}, fmt.Errorf("Expected service account or cluster specified") } + + // If preferredNamespace is "", then kubeconfig preferred namespace will be used + clusterAccessInfo.Namespace = preferredNamespace + return clusterAccessInfo, nil } diff --git a/pkg/packageinstall/app.go b/pkg/packageinstall/app.go index 17bf8f2eb5..23ce547d78 100644 --- a/pkg/packageinstall/app.go +++ b/pkg/packageinstall/app.go @@ -62,6 +62,7 @@ func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall desiredApp.Spec.Paused = pkgInstall.Spec.Paused desiredApp.Spec.Canceled = pkgInstall.Spec.Canceled desiredApp.Spec.Cluster = pkgInstall.Spec.Cluster + desiredApp.Spec.DefaultNamespace = pkgInstall.Spec.DefaultNamespace err := controllerutil.SetControllerReference(pkgInstall, desiredApp, scheme.Scheme) if err != nil { diff --git a/pkg/packageinstall/app_test.go b/pkg/packageinstall/app_test.go index 16477431e2..f1c985e18c 100644 --- a/pkg/packageinstall/app_test.go +++ b/pkg/packageinstall/app_test.go @@ -677,3 +677,42 @@ func TestAppPackageDetailsAnnotations(t *testing.T) { require.Equal(t, expectedObjectMeta, app.ObjectMeta) } + +// TestAppPackageIntallDefaultNamespace tests the creation of an App when using PackageInstall with a defaultNamespace defined. +func TestAppPackageIntallDefaultNamespace(t *testing.T) { + ipkg := &pkgingv1alpha1.PackageInstall{ + ObjectMeta: metav1.ObjectMeta{ + Name: "app", + Namespace: "default", + }, + Spec: pkgingv1alpha1.PackageInstallSpec{ + DefaultNamespace: "default-namespace", + SyncPeriod: &metav1.Duration{100 * time.Second}, + }, + } + + pkgVersion := datapkgingv1alpha1.Package{ + Spec: datapkgingv1alpha1.PackageSpec{ + RefName: "expec-pkg", + Version: "1.5.0", + Template: datapkgingv1alpha1.AppTemplateSpec{ + Spec: &kcv1alpha1.AppSpec{}, + }, + }, + } + + app, err := packageinstall.NewApp(&kcv1alpha1.App{}, ipkg, pkgVersion, packageinstall.Opts{}) + require.NoError(t, err) + + expectedApp := &kcv1alpha1.App{ + Spec: kcv1alpha1.AppSpec{ + DefaultNamespace: "default-namespace", + SyncPeriod: &metav1.Duration{100 * time.Second}, + }, + } + + // Not interested in metadata in this test + app.ObjectMeta = metav1.ObjectMeta{} + + require.Equal(t, expectedApp, app, "App does not match expected app") +} diff --git a/pkg/packageinstall/packageinstall.go b/pkg/packageinstall/packageinstall.go index 4c72b38ca9..9745f8498f 100644 --- a/pkg/packageinstall/packageinstall.go +++ b/pkg/packageinstall/packageinstall.go @@ -373,6 +373,7 @@ func (pi *PackageInstallCR) reconcileDelete(modelStatus *reconciler.Status) (rec if existingApp.Spec.Canceled != pi.model.Spec.Canceled { existingApp.Spec.Canceled = pi.model.Spec.Canceled } + existingApp.Spec.DefaultNamespace = pi.model.Spec.DefaultNamespace if !equality.Semantic.DeepEqual(existingApp, unchangeExistingApp) { existingApp, err = pi.kcclient.KappctrlV1alpha1().Apps(existingApp.Namespace).Update( diff --git a/pkg/pkgrepository/app_deploy.go b/pkg/pkgrepository/app_deploy.go index b4e29e2284..1f5bc61312 100644 --- a/pkg/pkgrepository/app_deploy.go +++ b/pkg/pkgrepository/app_deploy.go @@ -73,5 +73,5 @@ func (a *App) delete() exec.CmdRunResult { func (a *App) newKapp(kapp v1alpha1.AppDeployKapp, cancelCh chan struct{}) (*ctldep.Kapp, error) { genericOpts := kubeconfig.AccessInfo{Name: a.app.Name, Namespace: a.app.Namespace} - return a.deployFactory.NewKappPrivilegedForPackageRepository(kapp, genericOpts, cancelCh) + return a.deployFactory.NewKappPrivilegedForPackageRepository(kapp, genericOpts, cancelCh, a.app.Namespace) } diff --git a/test/e2e/kappcontroller/default_namespace_test.go b/test/e2e/kappcontroller/default_namespace_test.go new file mode 100644 index 0000000000..041d2ceba8 --- /dev/null +++ b/test/e2e/kappcontroller/default_namespace_test.go @@ -0,0 +1,222 @@ +// Copyright 2023 VMware, Inc. +// SPDX-License-Identifier: Apache-2.0 + +package kappcontroller + +import ( + "fmt" + "strings" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/vmware-tanzu/carvel-kapp-controller/test/e2e" +) + +func Test_AppDefaultNamespace(t *testing.T) { + env := e2e.BuildEnv(t) + logger := e2e.Logger{} + kapp := e2e.Kapp{t, env.Namespace, logger} + kubectl := e2e.Kubectl{t, env.Namespace, logger} + name := "app-default-namespace" + defaultNamespace := "default-namespace" + defaultNamespaceApp := "default-namespace-app" + + cleanUp := func() { + kapp.Run([]string{"delete", "-a", name}) + kapp.Run([]string{"delete", "-a", defaultNamespaceApp}) + } + cleanUp() + defer cleanUp() + + namespaceYAML := fmt.Sprintf(`--- +apiVersion: v1 +kind: Namespace +metadata: + name: %s`, defaultNamespace) + + sas := e2e.ServiceAccounts{env.Namespace} + appYAML := fmt.Sprintf(`--- +apiVersion: kappctrl.k14s.io/v1alpha1 +kind: App +metadata: + name: %s + namespace: %s +spec: + serviceAccountName: kappctrl-e2e-ns-sa + defaultNamespace: %s + fetch: + - inline: + paths: + file.yml: | + apiVersion: v1 + kind: ConfigMap + metadata: + name: my-cm + data: + key: value + template: + - ytt: {} + deploy: + - kapp: {}`, name, env.Namespace, defaultNamespace) + sas.ForClusterYAML() + + kapp.RunWithOpts([]string{"deploy", "-a", defaultNamespaceApp, "-f", "-"}, e2e.RunOpts{StdinReader: strings.NewReader(namespaceYAML)}) + + _, err := kapp.RunWithOpts([]string{"deploy", "-a", name, "-f", "-"}, e2e.RunOpts{AllowError: true, StdinReader: strings.NewReader(appYAML)}) + assert.NoError(t, err, "Expected app deploy to succeed, it did not") + + // Assert that app resources are in defaultNamespace + kubectl.RunWithOpts([]string{"get", "configmap", "my-cm", "-n", defaultNamespace}, e2e.RunOpts{NoNamespace: true}) + + // Assert that kapp metaconfigmap is in app namespace + kubectl.RunWithOpts([]string{"get", "configmap", name + ".app", "-n", env.Namespace}, e2e.RunOpts{NoNamespace: true}) +} + +func Test_PackageInstall_DefaultNamespace(t *testing.T) { + env := e2e.BuildEnv(t) + logger := e2e.Logger{} + kapp := e2e.Kapp{t, env.Namespace, logger} + kubectl := e2e.Kubectl{t, env.Namespace, logger} + name := "app-default-namespace" + defaultNamespace := "default-namespace" + pkgiNamespace := "pkgi-namespace" + pkgiName := "test-pkgi" + appName := "test-app" + + cleanUp := func() { + kapp.Run([]string{"delete", "-a", name}) + } + cleanUp() + defer cleanUp() + + sas := e2e.ServiceAccounts{env.Namespace} + + namespacesYAML := fmt.Sprintf(` +--- +apiVersion: v1 +kind: Namespace +metadata: + name: %s +--- +apiVersion: v1 +kind: Namespace +metadata: + name: %s +`, defaultNamespace, pkgiNamespace) + + rbacYAML := sas.ForDefaultNamespaceYAML(defaultNamespace) + + installPkgYAML := fmt.Sprintf(` +--- +apiVersion: data.packaging.carvel.dev/v1alpha1 +kind: PackageMetadata +metadata: + name: pkg.test.carvel.dev + namespace: %[1]s +spec: + # This is the name we want to reference in resources such as PackageInstall. + displayName: "Test PackageMetadata in repo" + shortDescription: "PackageMetadata used for testing" + longDescription: "A longer, more detailed description of what the package contains and what it is for" + providerName: Carvel + maintainers: + - name: carvel + categories: + - testing + supportDescription: "Description of support provided for the package" +--- +apiVersion: data.packaging.carvel.dev/v1alpha1 +kind: Package +metadata: + name: pkg.test.carvel.dev.1.0.0 + namespace: %[1]s +spec: + refName: pkg.test.carvel.dev + version: 1.0.0 + licenses: + - Apache 2.0 + capactiyRequirementsDescription: "cpu: 1,RAM: 2, Disk: 3" + releaseNotes: | + - Introduce simple-app package + releasedAt: 2021-05-05T18:57:06Z + template: + spec: + fetch: + - inline: + paths: + file.yml: | + apiVersion: v1 + kind: ConfigMap + metadata: + name: my-cm + data: + key: value + template: + - ytt: {} + deploy: + - kapp: + rawOptions: ["--app-changes-max-to-keep=0"] +--- +apiVersion: packaging.carvel.dev/v1alpha1 +kind: PackageInstall +metadata: + name: %[2]s + namespace: %[1]s + annotations: +spec: + defaultNamespace: %[3]s + serviceAccountName: kappctrl-e2e-ns-sa + packageRef: + refName: pkg.test.carvel.dev + versionSelection: + constraints: 1.0.0 +`, pkgiNamespace, pkgiName, defaultNamespace) + + // deploy app with workspace and pkgi + _, err := kapp.RunWithOpts([]string{"deploy", "-a", name, "-f", "-"}, e2e.RunOpts{StdinReader: strings.NewReader(appWithInlineResources(appName, namespacesYAML+rbacYAML+installPkgYAML) + sas.ForClusterYAML()), AllowError: true}) + assert.NoError(t, err, "Expected app deploy to succeed, it did not") + + // assert that pkgi resources are present in defaultNamespace + kubectl.RunWithOpts([]string{"get", "configmap", "my-cm", "-n", defaultNamespace}, e2e.RunOpts{NoNamespace: true}) + + // assert that kapp configmap is present in the pkgi namespace + kubectl.RunWithOpts([]string{"get", "configmap", pkgiName + ".app", "-n", pkgiNamespace}, e2e.RunOpts{NoNamespace: true}) + + // deploy app with workspace only, i.e. delete pkgi + _, err = kapp.RunWithOpts([]string{"deploy", "-a", name, "-f", "-"}, e2e.RunOpts{AllowError: true, StdinReader: strings.NewReader(appWithInlineResources(appName, namespacesYAML) + sas.ForClusterYAML())}) + assert.NoError(t, err, "Expected app deploy to succeed, it did not") + + cleanUp() + + // deploy app with workspace and pkgi again + _, err = kapp.RunWithOpts([]string{"deploy", "-a", name, "-f", "-"}, e2e.RunOpts{AllowError: true, StdinReader: strings.NewReader(appWithInlineResources(appName, namespacesYAML+rbacYAML+installPkgYAML) + sas.ForClusterYAML())}) + assert.NoError(t, err, "Expected app deploy to succeed, it did not") + + // delete app, i.e complete workspace along with pkgis + _, err = kapp.RunWithOpts([]string{"delete", "-a", name}, e2e.RunOpts{AllowError: true}) + assert.NoError(t, err, "Expected app delete to succeed gracefully, it did not") +} + +func appWithInlineResources(name, resources string) string { + // Add indentation for the resources as these would be added inline to the App CR + indentedResourceYAML := "" + for _, line := range strings.Split(resources, "\n") { + indentedResourceYAML += " " + indentedResourceYAML += line + } + return fmt.Sprintf(`--- +apiVersion: kappctrl.k14s.io/v1alpha1 +kind: App +metadata: + name: %s +spec: + serviceAccountName: kappctrl-e2e-ns-sa + fetch: + - inline: + paths: + file.yml: | +%s + template: + - ytt: {} + deploy: + - kapp: {}`, name, indentedResourceYAML) +} diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index 89b34e08e2..5b01dbf68b 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -84,3 +84,63 @@ roleRef: name: kappctrl-e2e-ns-role `, sa.Namespace) } + +// ForDefaultNamespaceYAML can be used to get service account with permissions in defaultNamespace +func (sa ServiceAccounts) ForDefaultNamespaceYAML(defaultNamespace string) string { + return fmt.Sprintf(` +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kappctrl-e2e-ns-sa + namespace: %[2]s +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kappctrl-e2e-ns-role + namespace: %[1]s +rules: +- apiGroups: ["*"] + resources: ["*"] + verbs: ["*"] +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kappctrl-e2e-ns-role-binding + namespace: %[1]s +subjects: +- kind: ServiceAccount + name: kappctrl-e2e-ns-sa + namespace: %[2]s +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: kappctrl-e2e-ns-role +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kappctrl-e2e-ns-role + namespace: %[2]s +rules: +- apiGroups: [""] + resources: ["configmaps"] + verbs: ["get", "list", "create", "delete", "update"] +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: kappctrl-e2e-ns-role-binding + namespace: %[2]s +subjects: +- kind: ServiceAccount + name: kappctrl-e2e-ns-sa + namespace: %[2]s +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: kappctrl-e2e-ns-role +`, defaultNamespace, sa.Namespace) +}