diff --git a/addons/master/master.go b/addons/master/master.go index e9ca949ce3..967a5f06ec 100644 --- a/addons/master/master.go +++ b/addons/master/master.go @@ -43,18 +43,18 @@ import ( type masterTrait struct { trait.BaseTrait `property:",squash"` // Enables automatic configuration of the trait. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` // When this flag is active, the operator analyzes the source code to add dependencies required by delegate endpoints. // E.g. when using `master:lockname:timer`, then `camel:timer` is automatically added to the set of dependencies. // It's enabled by default. - IncludeDelegateDependencies *bool `property:"include-delegate-dependencies"` + IncludeDelegateDependencies *bool `property:"include-delegate-dependencies" json:"includeDelegateDependencies,omitempty"` // Name of the configmap that will be used to store the lock. Defaults to "-lock". - Configmap *string `property:"configmap"` + Configmap *string `property:"configmap" json:"configmap,omitempty"` // Label that will be used to identify all pods contending the lock. Defaults to "camel.apache.org/integration". - LabelKey *string `property:"label-key"` + LabelKey *string `property:"label-key" json:"labelKey,omitempty"` // Label value that will be used to identify all pods contending the lock. Defaults to the integration name. - LabelValue *string `property:"label-value"` - delegateDependencies []string + LabelValue *string `property:"label-value" json:"labelValue,omitempty"` + delegateDependencies []string `json:"-"` } // NewMasterTrait -- diff --git a/addons/threescale/3scale.go b/addons/threescale/3scale.go index 77643cb755..41c6b4587f 100644 --- a/addons/threescale/3scale.go +++ b/addons/threescale/3scale.go @@ -34,15 +34,15 @@ import ( type threeScaleTrait struct { trait.BaseTrait `property:",squash"` // Enables automatic configuration of the trait. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` // The scheme to use to contact the service (default `http`) - Scheme string `property:"scheme"` + Scheme string `property:"scheme" json:"scheme,omitempty"` // The path where the API is published (default `/`) - Path string `property:"path"` + Path string `property:"path" json:"path,omitempty"` // The port where the service is exposed (default `80`) - Port int `property:"port"` + Port int `property:"port" json:"port,omitempty"` // The path where the Open-API specification is published (default `/openapi.json`) - DescriptionPath *string `property:"description-path"` + DescriptionPath *string `property:"description-path" json:"descriptionPath,omitempty"` } const ( diff --git a/addons/tracing/tracing.go b/addons/tracing/tracing.go index 9a088a5217..28c5c9f5cb 100644 --- a/addons/tracing/tracing.go +++ b/addons/tracing/tracing.go @@ -35,15 +35,15 @@ import ( type tracingTrait struct { trait.BaseTrait `property:",squash"` // Enables automatic configuration of the trait, including automatic discovery of the tracing endpoint. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` // The name of the service that publishes tracing data (defaults to the integration name) - ServiceName string `property:"service-name"` + ServiceName string `property:"service-name" json:"serviceName,omitempty"` // The target endpoint of the OpenTracing service (automatically discovered by default) - Endpoint string `property:"endpoint"` + Endpoint string `property:"endpoint" json:"endpoint,omitempty"` // The sampler type (default "const") - SamplerType *string `property:"sampler-type"` + SamplerType *string `property:"sampler-type" json:"samplerType,omitempty"` // The sampler specific param (default "1") - SamplerParam *string `property:"sampler-param"` + SamplerParam *string `property:"sampler-param" json:"samplerParam,omitempty"` } const ( diff --git a/deploy/crd-integration-kit.yaml b/deploy/crd-integration-kit.yaml index 0f872571cc..bf2913b5ec 100644 --- a/deploy/crd-integration-kit.yaml +++ b/deploy/crd-integration-kit.yaml @@ -94,12 +94,6 @@ spec: type: array traits: additionalProperties: - description: A TraitSpec contains the configuration of a trait - properties: - configuration: - additionalProperties: - type: string - type: object type: object type: object type: object diff --git a/deploy/crd-integration-platform.yaml b/deploy/crd-integration-platform.yaml index 34fd0b84d6..91e6173add 100644 --- a/deploy/crd-integration-platform.yaml +++ b/deploy/crd-integration-platform.yaml @@ -183,12 +183,6 @@ spec: type: object traits: additionalProperties: - description: A TraitSpec contains the configuration of a trait - properties: - configuration: - additionalProperties: - type: string - type: object type: object type: object type: object @@ -355,12 +349,6 @@ spec: type: object traits: additionalProperties: - description: A TraitSpec contains the configuration of a trait - properties: - configuration: - additionalProperties: - type: string - type: object type: object type: object version: diff --git a/deploy/crd-integration.yaml b/deploy/crd-integration.yaml index 6157ce4d3e..57ac9ca7be 100644 --- a/deploy/crd-integration.yaml +++ b/deploy/crd-integration.yaml @@ -160,9 +160,9 @@ spec: description: A TraitSpec contains the configuration of a trait properties: configuration: - additionalProperties: - type: string type: object + required: + - configuration type: object type: object type: object diff --git a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml index 6157ce4d3e..57ac9ca7be 100644 --- a/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml +++ b/deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml @@ -160,9 +160,9 @@ spec: description: A TraitSpec contains the configuration of a trait properties: configuration: - additionalProperties: - type: string type: object + required: + - configuration type: object type: object type: object diff --git a/deploy/resources.go b/deploy/resources.go index 889dd97cb9..63dea323ef 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -126,23 +126,23 @@ var assets = func() http.FileSystem { "/crd-integration-kit.yaml": &vfsgen۰CompressedFileInfo{ name: "crd-integration-kit.yaml", modTime: time.Time{}, - uncompressedSize: 7316, + uncompressedSize: 7066, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\x4f\x73\xdb\xba\x11\xbf\xf3\x53\xec\x58\x87\xbc\x37\x63\x51\x4d\x7b\xe9\xa8\x27\xd5\x89\xa7\x6a\x12\xdb\x63\x29\xef\xcd\x9b\xc9\x65\x45\xae\xa8\xad\x48\x80\x05\x40\xc9\x6e\xa7\xdf\xbd\xb3\x00\x25\x91\x12\x29\xcb\x4e\xc2\x9b\x80\xc5\xee\x6f\xff\xfd\x16\xc2\x00\x86\x3f\xee\x8b\x06\xf0\x99\x13\x52\x96\x52\x70\x1a\xdc\x8a\x60\x52\x62\xb2\x22\x98\xe9\xa5\xdb\xa2\x21\xb8\xd5\x95\x4a\xd1\xb1\x56\xf0\xcb\x64\x76\xfb\x2b\x54\x2a\x25\x03\x5a\x11\x68\x03\x85\x36\x14\x0d\x20\xd1\xca\x19\x5e\x54\x4e\x1b\xc8\x83\x42\xc0\xcc\x10\x15\xa4\x9c\x8d\x01\x66\x44\x5e\xfb\xdd\xfd\x7c\x7a\xf3\x11\x96\x9c\x13\xa4\x6c\xc3\x21\x4a\x61\xcb\x6e\x15\x0d\xc0\xad\xd8\xc2\x56\x9b\x35\x2c\xb5\x01\x4c\x53\x16\xc3\x98\x03\xab\xa5\x36\x45\x80\x61\x28\x43\x93\xb2\xca\x20\xd1\xe5\xb3\xe1\x6c\xe5\x40\x6f\x15\x19\xbb\xe2\x32\x8e\x06\x30\x17\x37\x66\xb7\x3b\x24\x36\xa8\xf5\x36\x9d\x86\x3f\x74\x55\xfb\xd0\x70\xb7\x8e\xc2\x35\xfc\x46\xc6\x8a\x91\x3f\xc7\x7f\x8a\x06\xf0\x8b\x88\x5c\xd5\x9b\x57\xbf\xfe\x0d\x9e\x75\x05\x05\x3e\x83\xd2\x0e\x2a\x4b\x0d\xcd\xf4\x94\x50\xe9\x80\x15\x24\xba\x28\x73\x46\x95\xd0\xc1\xad\xbd\x85\x18\x3c\x00\xd1\xa1\x17\x0e\x59\x01\x7a\x37\x40\x2f\x9b\x62\x80\x2e\x1a\x44\x03\xf0\xdf\xca\xb9\x72\x3c\x1a\x6d\xb7\xdb\x18\x3d\xdc\x58\x9b\x6c\xb4\xf3\x6e\xf4\x79\x7a\xf3\xf1\x6e\xf6\x71\xe8\x21\x47\x03\xf8\xaa\x72\xb2\x16\x0c\xfd\xbb\x62\x43\x29\x2c\x9e\x01\xcb\x32\xe7\x04\x17\x39\x41\x8e\x5b\x49\x9c\xcf\x8e\x4f\x3a\x2b\xd8\x1a\x76\xac\xb2\x6b\xb0\x75\xd6\xa3\x41\x2b\x3b\x87\x70\xed\xe0\xb1\x6d\x09\x68\x05\xa8\xe0\x6a\x32\x83\xe9\xec\x0a\xfe\x3e\x99\x4d\x67\xd7\xd1\x00\x7e\x9f\xce\xff\x71\xff\x75\x0e\xbf\x4f\x1e\x1f\x27\x77\xf3\xe9\xc7\x19\xdc\x3f\xc2\xcd\xfd\xdd\x87\xe9\x7c\x7a\x7f\x37\x83\xfb\x5b\x98\xdc\xfd\x01\x9f\xa6\x77\x1f\xae\x81\xd8\xad\xc8\x00\x3d\x95\x46\xf0\x6b\x03\x2c\x81\xa4\x54\x72\xba\x2b\xa0\x1d\x00\xa9\x0f\xf9\x6d\x4b\x4a\x78\xc9\x09\xe4\xa8\xb2\x0a\x33\x82\x4c\x6f\xc8\x28\x29\x8f\x92\x4c\xc1\x56\xd2\x69\x01\x55\x1a\x0d\x20\xe7\x82\x9d\xaf\x22\x7b\xea\x94\x98\xf9\x91\xbd\x15\x61\xc9\x75\x39\x8d\x01\x4b\xa6\x27\x47\xca\xa3\x89\xd7\x7f\xb5\x31\xeb\xd1\xe6\xfd\x82\x1c\xbe\x8f\xd6\xac\xd2\x31\xdc\x54\xd6\xe9\xe2\x91\xac\xae\x4c\x42\x1f\x68\xc9\xca\x97\x7f\x54\x90\xc3\x14\x1d\x8e\x23\x00\x85\x05\x8d\x81\x95\xa3\xcc\x78\x47\xd6\xec\x6c\x9c\x60\x41\x79\xa3\x38\x22\x80\x1c\x17\x94\x5b\x39\x02\x92\xfe\x31\x5c\x79\xa1\xe1\xfa\x2a\x92\x98\xc9\xc6\xa1\xbf\x1e\x8c\x68\x34\x37\x3a\xaf\x0a\x55\x1f\x1a\xc2\x3f\x67\xf7\x77\x0f\xe8\x56\x63\x88\xad\x43\x57\xd9\xb8\x5c\xa1\xa5\x28\x54\x65\x4a\x36\x31\x5c\x3a\xef\x9e\xb4\x5c\x03\x14\xac\xd9\x41\x53\x38\xc0\x7e\x68\xac\xb8\xe7\x92\xc6\x20\x25\xa4\xb2\x53\x7b\x3b\x97\xe3\xe0\x46\x70\xf0\x5b\xed\xe1\x37\x71\xf1\xdb\x68\xcd\xee\x5b\x2c\x6a\x2e\x05\xd4\x90\x0d\x78\xe6\x87\x85\xf3\x70\x6a\xf7\xb9\xc0\xec\x62\x6b\x4d\xe1\x60\x6e\xda\x58\x39\xb2\x97\x19\x5d\x95\x63\xe8\xc8\xa3\x1c\xad\x33\x12\xca\x64\x7a\xb0\xf3\x89\x9d\xdf\xc8\xd9\xba\x4f\x1d\x9b\x9f\xd9\x06\x81\x32\xaf\x0c\xe6\x27\x75\xe3\xf7\xec\x4a\x1b\x77\x77\xb0\x22\xae\xf3\x3a\x6c\xb1\xca\xaa\x1c\xcd\xf1\xc1\x08\xc0\x26\x5a\x1c\xf0\xe7\x4a\x4c\x28\x95\xb5\x6a\x61\xea\xea\xad\x75\x85\xb8\x8d\xe1\xbf\xff\x8b\x00\x36\x98\x73\x98\x24\x61\x53\x97\xa4\x26\x0f\xd3\xdf\xfe\x32\x4b\x56\x54\xe0\xb8\x2b\xb0\x6d\x7f\x84\x76\xa4\x61\xc3\x81\x3d\x07\x1c\x79\x05\x93\x87\x69\xad\xab\x34\xba\x24\xe3\xf8\xe0\x9b\x34\xc3\xbe\x2b\xf7\x6b\x47\x56\xdf\x09\xac\x7a\x10\xa4\xd2\x87\x14\xec\x6e\xc2\x1a\xa5\x60\x03\x02\x4f\xda\x2c\x5c\x2b\x9c\x45\x2a\x70\x4b\x43\x2d\x88\x08\x2a\xd0\x8b\x7f\x51\xe2\x62\x98\x91\x11\x25\x12\xf4\x2a\x4f\x65\x6e\x6e\xc8\x38\x30\x94\xe8\x4c\xf1\x7f\xf6\x9a\xed\x6e\x1c\xe7\xe8\xa8\x4e\xe2\xee\xf3\xad\x2a\x43\x71\x83\x79\x45\xd7\x42\x6d\x7e\x9e\x18\x12\x1b\x50\xa9\x86\x36\x2f\x62\x63\xf8\xa2\x0d\xf9\x21\x3a\xf6\xd3\xc4\x8e\x47\xa3\x8c\xdd\x8e\x87\x12\x5d\x14\x95\x62\xf7\x3c\x6a\x0c\x72\x3b\x4a\x69\x43\xf9\xc8\x72\x36\x44\x93\xac\xd8\x51\xe2\x2a\x43\x23\x2c\x79\xe8\x81\x2b\x4f\xa4\x71\x91\x0e\xf6\x69\x7f\xd7\x40\x7a\xd2\x52\xfb\x1a\xee\x8d\xbb\x14\xb1\x24\x19\xeb\x63\x01\xff\x21\xbc\xb2\x24\x51\x79\xfc\x38\x9b\xc3\xce\xa8\x4f\x41\x3b\xe6\x3e\xda\x87\x63\xf6\x10\x78\x09\x14\xab\xa5\x67\x7e\x19\xdd\x46\x17\x5e\x23\xa9\xb4\xd4\xac\x9c\xff\x91\xe4\x4c\xaa\x1d\x74\x5b\x2d\x0a\xa9\x2d\x99\xaa\x64\x9d\xe4\x27\x86\x1b\x54\x72\x11\x58\x10\x54\x65\x8a\x8e\xd2\x18\xa6\x0a\x6e\xa4\x89\x6f\x50\x66\xfd\x4f\x0e\xbb\x44\xd8\x0e\x25\xa4\x2f\x07\xbe\x39\x44\xda\x82\x21\x5a\xfb\xe5\xdd\x74\xe8\xcc\x50\xbb\x1f\x67\x25\x25\xad\x06\x49\xc9\xfa\x2b\x87\xf4\x3d\x49\xe9\x77\x90\x55\x7f\x67\xca\x97\x68\xb5\xe4\xac\x32\x0d\x9e\x68\x54\xbe\xa3\xc2\x1e\x2f\x1e\x21\xbc\x69\x2a\xf0\x00\x87\xc3\x93\x13\x7d\xd6\x1b\x61\xe9\x58\xef\x89\xec\xe1\xf3\xd5\xfa\x86\x93\xbb\xab\x5a\xd7\xd1\x61\x73\x6c\xb5\x37\xbc\xb9\x93\x9d\xce\xa4\x36\xb7\xd0\x18\x7c\x6e\xed\xa4\x54\x92\x4a\x49\x25\x1d\x01\xe9\x89\xf9\x19\x7f\xfa\xac\xf8\x81\x78\xac\xa9\x57\x4f\x69\xb4\xdc\xab\x8f\xe5\xdb\x63\xd7\x20\xbb\x87\x20\xd8\xe8\x76\x3f\x0f\xad\x27\x67\x11\x90\xd2\x44\x07\xf2\x67\x86\x94\xdc\x81\xd3\x13\x6f\x4e\x6e\x93\xac\xac\xc3\x3c\xf7\x45\x34\x6a\xcc\x97\x4b\xd1\x1b\x2a\xb5\x65\xa7\xcd\x4f\x8d\x68\x70\xef\x58\x55\xf3\x5a\xd7\x5f\xe6\xad\x40\x4e\x42\x28\x7d\xbb\x08\x17\x21\xab\xd0\xd0\xad\x76\xf4\xb3\x2c\x18\x7d\x65\x47\x9d\xed\xea\xd7\xa0\x7e\x31\x54\x4d\x81\xce\x1e\xb8\xa0\x41\x4e\xb6\xba\x79\x32\xdc\x6d\x2e\x64\x4a\x2f\xdc\xe2\x4a\xbd\xb0\x32\x93\xbe\x87\x2c\xd1\x38\x5e\x62\x72\x5a\x02\x97\x10\xe5\xa4\x3e\xfc\x7a\x7e\x4c\x56\x94\xac\x6d\x55\xbc\x89\x23\xb9\x93\xe5\x5e\x3c\x96\xeb\xe4\x4c\xf1\xbc\x70\xd8\xa1\xc9\xc8\xfd\x70\x62\xe6\x53\x22\x79\x03\xf9\x2e\xd0\xd2\xf4\x55\xd4\x98\x68\x15\x7a\xe5\x4d\x79\x6f\x57\xd9\xcd\x4e\x57\x2d\xb4\xa8\xab\x73\x5f\x94\xb8\xbf\x67\x75\xc4\x40\x68\x15\x12\x32\xfe\x21\xc3\xdf\x9f\xe2\x57\xd6\x52\x8e\xd6\xcd\x0d\x2a\xeb\x41\xcc\xb9\xe8\x99\x9f\x2d\x17\x3e\xa3\x75\xe0\xb8\xa0\x1d\x47\xd5\x2e\xb8\xbd\x22\x4a\xc3\xd5\x4e\x2b\xaa\x1b\xb5\x8f\x4a\x34\xa0\xd2\x6e\x45\xe6\x14\x39\x84\xc9\x50\xa0\x1b\x83\x5c\xef\x86\x62\xf2\x4d\xc5\x8b\xd6\x7d\xf5\x37\xc4\x0b\x1d\x9c\xfb\x9b\xff\xc1\x49\xb6\x0d\x2f\xb7\x68\xf7\xf7\xcd\x9f\x87\xb9\x20\x6b\x3b\x8a\xb2\x03\xec\x04\x56\x55\x81\x0a\x0c\x61\xea\x9f\x98\xea\xa3\xc0\x2a\x65\xe9\x5a\x95\x41\x4a\x0e\x39\xb7\x80\x0b\x5d\x9d\x32\x72\x0d\x68\x45\x8d\x0c\x76\xbb\xf6\x02\x68\x43\x68\xfb\x38\xe2\x24\xc0\x41\x78\x3f\xfb\xf7\x01\x7e\x67\xeb\xd8\x7f\x1f\x96\xd3\xf9\xd0\x83\xa5\x9e\x0d\xf5\x03\xe0\x1e\xc6\x75\x78\x63\x5d\xc2\xdc\xc8\xbf\xbc\x5b\xcc\x2d\x5d\xc3\x57\xb5\x56\x7a\xfb\x36\x44\xfd\xf7\xda\x76\x6c\x9e\x4b\x6f\xb7\xf9\xa0\xb1\x47\xf5\x06\xc3\xe7\x49\xb4\xb7\x3b\x7b\x2e\xbe\x6f\xb9\xde\x72\x46\xf6\x84\xfe\x7b\x31\x2f\x91\xf3\xca\x9c\xbf\x79\xde\x06\x99\xd3\xd9\x79\x8e\xed\xfa\xab\xf3\x85\xf8\x25\x7a\x43\xe6\xb9\xeb\x60\x17\xa8\xc7\x5a\xbe\x6b\xb0\xbf\x44\xc7\x42\xe9\x8e\x8a\xb2\x67\x58\xee\x90\xfa\xd2\x20\x73\x4e\xc1\x17\x7c\xfa\x6e\x1d\xfd\x6c\x79\x29\xc9\x5d\xc0\x18\xfd\xc5\x29\x35\x58\x23\x39\xbf\xfb\x05\x9f\x7a\x93\xda\x77\x09\xed\x71\xed\x12\xb7\xce\xb8\xd4\xef\xce\xb0\x2e\xbf\xce\x8d\x50\x30\x1d\x5b\x1d\x08\x7a\xdd\x7a\xe5\xff\xbb\x15\xda\xf3\x3d\xd6\xbe\xa8\xf8\xb7\xe3\xd3\x92\xee\xd7\x9f\xa3\x93\x60\x5e\x0c\xc8\x54\x4a\xbc\x7d\x30\x7a\xc3\x29\x99\xb3\xd0\x1e\xdb\xb2\xaf\x80\x55\x5b\xe9\x78\x81\x3c\x7b\x6c\xf3\x2a\xf9\x8e\x14\x1d\x2d\xed\xf4\xc1\xe6\xfd\xe1\xd7\xfe\xe1\x3f\x3c\x57\xfb\x2d\xf9\xc2\xff\x94\x31\x38\xb3\x7f\x6e\xb0\x4e\x1b\xc9\x76\x58\xfb\x7f\x00\x00\x00\xff\xff\x7f\x7e\x5a\x93\x94\x1c\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\x4f\x73\xdb\xba\x11\xbf\xf3\x53\xec\x58\x87\xbc\x37\x63\x51\x4d\x7b\xe9\xa8\x27\xd5\x89\xa7\x6a\x12\xdb\x63\x29\xef\xcd\x9b\xc9\x65\x45\xae\xa8\xad\x48\x80\x05\x40\xc9\x6e\xa7\xdf\xbd\xb3\x00\x45\x51\x12\x29\xcb\x4e\xa2\x9b\x80\xc5\xee\x6f\xff\xfd\x16\xe0\x00\x86\x3f\xee\x17\x0d\xe0\x33\x27\xa4\x2c\xa5\xe0\x34\xb8\x15\xc1\xa4\xc4\x64\x45\x30\xd3\x4b\xb7\x45\x43\x70\xab\x2b\x95\xa2\x63\xad\xe0\x97\xc9\xec\xf6\x57\xa8\x54\x4a\x06\xb4\x22\xd0\x06\x0a\x6d\x28\x1a\x40\xa2\x95\x33\xbc\xa8\x9c\x36\x90\x07\x85\x80\x99\x21\x2a\x48\x39\x1b\x03\xcc\x88\xbc\xf6\xbb\xfb\xf9\xf4\xe6\x23\x2c\x39\x27\x48\xd9\x86\x43\x94\xc2\x96\xdd\x2a\x1a\x80\x5b\xb1\x85\xad\x36\x6b\x58\x6a\x03\x98\xa6\x2c\x86\x31\x07\x56\x4b\x6d\x8a\x00\xc3\x50\x86\x26\x65\x95\x41\xa2\xcb\x67\xc3\xd9\xca\x81\xde\x2a\x32\x76\xc5\x65\x1c\x0d\x60\x2e\x6e\xcc\x6e\x77\x48\x6c\x50\xeb\x6d\x3a\x0d\x7f\xe8\xaa\xf6\xa1\xe5\x6e\x1d\x85\x6b\xf8\x8d\x8c\x15\x23\x7f\x8e\xff\x14\x0d\xe0\x17\x11\xb9\xaa\x37\xaf\x7e\xfd\x1b\x3c\xeb\x0a\x0a\x7c\x06\xa5\x1d\x54\x96\x5a\x9a\xe9\x29\xa1\xd2\x01\x2b\x48\x74\x51\xe6\x8c\x2a\xa1\xbd\x5b\x8d\x85\x18\x3c\x00\xd1\xa1\x17\x0e\x59\x01\x7a\x37\x40\x2f\xdb\x62\x80\x2e\x1a\x44\x03\xf0\xbf\x95\x73\xe5\x78\x34\xda\x6e\xb7\x31\x7a\xb8\xb1\x36\xd9\x68\xe7\xdd\xe8\xf3\xf4\xe6\xe3\xdd\xec\xe3\xd0\x43\x8e\x06\xf0\x55\xe5\x64\x2d\x18\xfa\x77\xc5\x86\x52\x58\x3c\x03\x96\x65\xce\x09\x2e\x72\x82\x1c\xb7\x92\x38\x9f\x1d\x9f\x74\x56\xb0\x35\xec\x58\x65\xd7\x60\xeb\xac\x47\x83\x83\xec\xec\xc3\xb5\x83\xc7\xf6\x40\x40\x2b\x40\x05\x57\x93\x19\x4c\x67\x57\xf0\xf7\xc9\x6c\x3a\xbb\x8e\x06\xf0\xfb\x74\xfe\x8f\xfb\xaf\x73\xf8\x7d\xf2\xf8\x38\xb9\x9b\x4f\x3f\xce\xe0\xfe\x11\x6e\xee\xef\x3e\x4c\xe7\xd3\xfb\xbb\x19\xdc\xdf\xc2\xe4\xee\x0f\xf8\x34\xbd\xfb\x70\x0d\xc4\x6e\x45\x06\xe8\xa9\x34\x82\x5f\x1b\x60\x09\x24\xa5\x92\xd3\x5d\x01\xed\x00\x48\x7d\xc8\x7f\x5b\x52\xc2\x4b\x4e\x20\x47\x95\x55\x98\x11\x64\x7a\x43\x46\x49\x79\x94\x64\x0a\xb6\x92\x4e\x0b\xa8\xd2\x68\x00\x39\x17\xec\x7c\x15\xd9\x53\xa7\xc4\xcc\x8f\xec\xad\x08\x4b\xae\xcb\x69\x0c\x58\x32\x3d\x39\x52\x1e\x4d\xbc\xfe\xab\x8d\x59\x8f\x36\xef\x17\xe4\xf0\x7d\xb4\x66\x95\x8e\xe1\xa6\xb2\x4e\x17\x8f\x64\x75\x65\x12\xfa\x40\x4b\x56\xbe\xfc\xa3\x82\x1c\xa6\xe8\x70\x1c\x01\x28\x2c\x68\x0c\xac\x1c\x65\xc6\x3b\xb2\x66\x67\xe3\x04\x0b\xca\x5b\xc5\x11\x01\xe4\xb8\xa0\xdc\xca\x11\x90\xf4\x8f\xe1\xca\x0b\x0d\xd7\x57\x91\xc4\x4c\x36\xf6\xfd\xf5\x60\x44\xa3\xb9\xd1\x79\x55\xa8\xfa\xd0\x10\xfe\x39\xbb\xbf\x7b\x40\xb7\x1a\x43\x6c\x1d\xba\xca\xc6\xe5\x0a\x2d\x45\xa1\x2a\x53\xb2\x89\xe1\xd2\x79\xf7\xa4\xe5\x5a\xa0\x60\xcd\x0e\xda\xc2\x01\xf6\x43\x6b\xc5\x3d\x97\x34\x06\x29\x21\x95\x9d\xda\xdb\xb9\x1c\x07\x37\x82\x83\xdf\x6a\x0f\xbf\x89\x8b\xdf\x46\x6b\x76\xdf\x62\x51\x73\x29\xa0\x96\x6c\xc0\x33\xdf\x2f\x9c\x87\x53\xbb\xcf\x05\x66\x17\x5b\x6b\x0b\x07\x73\xd3\xd6\xca\x91\xbd\xcc\xe8\xaa\x1c\x43\x47\x1e\xe5\x68\x9d\x91\x50\x26\xd3\xbd\x9d\x4f\xec\xfc\x46\xce\xd6\x7d\xea\xd8\xfc\xcc\x36\x08\x94\x79\x65\x30\x3f\xa9\x1b\xbf\x67\x57\xda\xb8\xbb\xbd\x15\x71\x9d\xd7\x61\x8b\x55\x56\xe5\x68\x8e\x0f\x46\x00\x36\xd1\xe2\x80\x3f\x57\x62\x42\xa9\xac\x55\x0b\x53\x57\x6f\xad\x2b\xc4\x6d\x0c\xff\xfd\x5f\x04\xb0\xc1\x9c\xc3\x24\x09\x9b\xba\x24\x35\x79\x98\xfe\xf6\x97\x59\xb2\xa2\x02\xc7\x5d\x81\x3d\xf4\x47\x68\x47\x1a\x36\x1c\x68\x38\xe0\xc8\x2b\x98\x3c\x4c\x6b\x5d\xa5\xd1\x25\x19\xc7\x7b\xdf\xa4\x19\x9a\xae\x6c\xd6\x8e\xac\xbe\x13\x58\xf5\x20\x48\xa5\x0f\x29\xd8\xdd\x84\x35\x4a\xc1\x06\x04\x9e\xb4\x59\xb8\x56\x38\x8b\x54\xe0\x96\x96\x5a\x10\x11\x54\xa0\x17\xff\xa2\xc4\xc5\x30\x23\x23\x4a\x24\xe8\x55\x9e\xca\xdc\xdc\x90\x71\x60\x28\xd1\x99\xe2\xff\x34\x9a\xed\x6e\x1c\xe7\xe8\xa8\x4e\xe2\xee\xe7\x5b\x55\x86\xe2\x06\xf3\x8a\xae\x85\xda\xfc\x3c\x31\x24\x36\xa0\x52\x2d\x6d\x5e\xc4\xc6\xf0\x45\x1b\xf2\x43\x74\xec\xa7\x89\x1d\x8f\x46\x19\xbb\x1d\x0f\x25\xba\x28\x2a\xc5\xee\x79\xd4\x1a\xe4\x76\x94\xd2\x86\xf2\x91\xe5\x6c\x88\x26\x59\xb1\xa3\xc4\x55\x86\x46\x58\xf2\xd0\x03\x57\x9e\x48\xe3\x22\x1d\x34\x69\x7f\xd7\x42\x7a\xd2\x52\x4d\x0d\xf7\xc6\x5d\x8a\x58\x92\x8c\xf5\xb1\x80\x7f\x1f\x5e\x59\x92\xa8\x3c\x7e\x9c\xcd\x61\x67\xd4\xa7\xe0\x30\xe6\x3e\xda\xfb\x63\x76\x1f\x78\x09\x14\xab\xa5\x67\x7e\x19\xdd\x46\x17\x5e\x23\xa9\xb4\xd4\xac\x9c\xff\x93\xe4\x4c\xea\x30\xe8\xb6\x5a\x14\x52\x5b\x32\x55\xc9\x3a\xc9\x4f\x0c\x37\xa8\xe4\x22\xb0\x20\xa8\xca\x14\x1d\xa5\x31\x4c\x15\xdc\x48\x13\xdf\xa0\xcc\xfa\x9f\x1c\x76\x89\xb0\x1d\x4a\x48\x5f\x0e\x7c\x7b\x88\x1c\x0a\x86\x68\x35\xcb\xbb\xe9\xd0\x99\xa1\xc3\x7e\x9c\x95\x94\x1c\x34\x48\x4a\xd6\x5f\x39\xa4\xef\x49\x4a\xbf\x83\xac\xfa\x3b\x53\x7e\x89\x56\x4b\xce\x2a\xd3\xe2\x89\x56\xe5\x3b\x2a\xec\xf1\xe2\x11\xc2\x9b\xb6\x02\x0f\x70\x38\x3c\x39\xd1\x67\xbd\x15\x96\x8e\xf5\x9e\xc8\xee\x7f\xbe\x5a\xdf\x70\x72\x77\x55\xeb\x3a\x3a\x6c\x8f\xad\xc3\x0d\x6f\xee\x64\xa7\x33\xa9\xed\x2d\x34\x06\x9f\x0f\x76\x52\x2a\x49\xa5\xa4\x92\x8e\x80\xf4\xc4\xfc\x8c\x3f\x7d\x56\xfc\x40\x3c\xd6\xd4\xab\xa7\x34\x5a\xee\xd5\xc7\xf2\x87\x63\xd7\x20\xbb\x87\x20\xd8\xea\x76\x3f\x0f\xad\x27\x67\x11\x90\xd2\x44\x07\xf2\x98\x21\x25\x77\xe0\xf4\xc4\x9b\x93\xdb\x24\x2b\xeb\x30\xcf\x7d\x11\x8d\x5a\xf3\xe5\x52\xf4\x86\x4a\x6d\xd9\x69\xf3\x53\x23\x1a\xdc\x3b\x56\xd5\xbe\xd6\xf5\x97\xf9\x8b\x65\x72\xb2\xd5\xcd\x16\x61\xc2\x5f\xc8\x17\x5e\xf8\x80\x31\xf4\xc2\x0a\x33\x7f\x0f\x65\xa0\x71\xbc\xc4\xe4\x34\x10\x97\xd0\xc5\xa4\x3e\xfc\x7a\x96\x48\x56\x94\xac\x6d\x55\xbc\x89\x29\xb8\xb3\xd7\x5f\x3c\x96\xeb\xa4\x93\x18\x2f\x3a\xec\xd0\x64\xe4\x7e\x38\x3d\xf1\x69\x3b\xbd\x81\x82\x16\x68\x69\xfa\x2a\x82\x48\xb4\x0a\x75\xfe\xa6\xbc\x1f\x56\xd9\xcd\x4e\x57\x2d\xb4\xa8\xab\xb3\x29\x4a\x6c\x6e\x1b\x1d\x31\x10\x72\x81\x84\x8c\x7f\xce\xfb\x5b\x44\xfc\xca\x5a\xca\xd1\xba\xb9\x41\x65\x3d\x88\x39\x17\x3d\x53\xe4\xc0\x85\xcf\x68\x1d\x38\x2e\xc2\xc3\xb8\x09\x87\xb0\x42\xad\x88\xd2\x70\xc1\xd1\x8a\xea\x46\xed\xd4\x0a\x72\xd9\x44\xa5\xe5\xf9\x7d\x8a\x1c\x02\x3f\x16\xe8\xc6\x20\x97\x9c\xa1\x98\x7c\x53\xf1\xa2\x75\x5f\xfd\x3d\xe9\x42\x07\xe7\xfe\xfe\xbb\x77\x92\x6d\xcb\xcb\x2d\xda\xe6\xd6\xf5\xf3\x30\x17\x64\x6d\x47\x51\x76\x80\x9d\xc0\xaa\x2a\x50\x81\x21\x4c\xfd\x87\x96\xfa\x28\xb0\x4a\x59\xba\x56\x65\x90\x92\x43\xce\x2d\xe0\x42\x57\xc7\x8d\xd1\x00\x5a\x51\x2b\x83\xdd\xae\xbd\x00\xda\x10\xda\x3e\x8e\x38\x09\x70\x10\x6e\x26\x60\x13\xe0\x77\xb6\x8e\xfd\xf7\x61\x39\x9d\x0f\x3d\x58\xea\xd9\x50\x7f\x06\x6b\x60\x5c\x87\x2f\x8d\x4b\x98\x1b\x79\xeb\xdc\x62\x6e\xe9\x1a\xbe\xaa\xb5\xd2\xdb\xb7\x21\xea\xbf\xdd\x1d\xc6\xe6\xb9\xf4\x76\xdb\xcf\xfa\x06\xd5\x1b\x0c\x9f\x27\xd1\xde\xee\xec\xb9\xfe\xbd\xe5\x92\xc7\x19\xd9\x13\xfa\xef\xc5\xbc\x44\xce\x2b\x73\xfe\xfe\x75\x1b\x64\x4e\x67\xe7\x39\xb6\xeb\xaf\xce\x17\xe2\x97\xe8\x0d\x99\xe7\xae\x83\x5d\xa0\x1e\x6b\xf9\xae\xc1\xfe\x12\x1d\x0b\xa5\x3b\x2a\xca\x9e\x61\xb9\x43\xea\x4b\x83\xcc\x39\x05\x5f\xf0\xe9\xbb\x75\xf4\xb3\xe5\xa5\x24\x77\x01\x63\xf4\x17\xa7\xd4\x60\x8d\xe4\xfc\xee\x17\x7c\xea\x4d\x6a\x67\xa5\x82\x27\xf6\x2e\x9b\x97\xb8\x75\xc6\xa5\x7e\x77\x86\x75\xf9\x75\x6e\x84\x82\xe9\xd8\xea\x40\xd0\xeb\xd6\x2b\x5f\x39\x2b\xb4\xe7\x7b\xec\xf0\xa2\xe2\xbf\xa0\x9e\x96\x74\xbf\xfe\x1c\x9d\x04\xf3\x62\x40\xa6\x52\xe2\xed\x83\xd1\x1b\x4e\xc9\x9c\x85\xf6\x78\x28\xfb\x0a\x58\xb5\x95\x8e\xef\x70\x67\x8f\x6d\x5e\x25\xdf\x91\xa2\xa3\xa5\x9d\x3e\xd8\xbc\xdf\xff\x6b\x3e\x7f\x87\x8f\xb6\x7e\x4b\x7e\xe1\x9d\x32\x06\x67\x9a\x47\xb7\x75\xda\x48\xb6\xc3\xda\xff\x03\x00\x00\xff\xff\x63\x3b\x50\x21\x9a\x1b\x00\x00"), }, "/crd-integration-platform.yaml": &vfsgen۰CompressedFileInfo{ name: "crd-integration-platform.yaml", modTime: time.Time{}, - uncompressedSize: 15192, + uncompressedSize: 14692, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x5f\x8f\xdb\xb8\x11\x7f\xf7\xa7\x18\xac\x1f\x72\x07\xac\xed\xa6\x7d\x29\xdc\x87\x62\xcf\x49\x50\x37\xc9\xee\x62\xe5\xe4\x70\x8f\x63\x69\x2c\xb3\xa6\x48\x95\xa4\xec\xf8\x8a\x7e\xf7\x62\x48\x49\x96\x6d\xc9\xf6\xee\xe6\x5a\xf4\x60\xbe\x24\x2b\x71\x86\xbf\xf9\xcb\xe1\x50\xee\xc3\xe0\xfb\x8d\x5e\x1f\x3e\x89\x98\x94\xa5\x04\x9c\x06\xb7\x24\xb8\xcb\x31\x5e\x12\x44\x7a\xe1\x36\x68\x08\x3e\xe8\x42\x25\xe8\x84\x56\xf0\xc3\x5d\xf4\xe1\x47\x28\x54\x42\x06\xb4\x22\xd0\x06\x32\x6d\xa8\xd7\x87\x58\x2b\x67\xc4\xbc\x70\xda\x80\x0c\x0c\x01\x53\x43\x94\x91\x72\x76\x08\x10\x11\x79\xee\xf7\x0f\xb3\xe9\xe4\x3d\x2c\x84\x24\x48\x84\x0d\x44\x94\xc0\x46\xb8\x65\xaf\x0f\x6e\x29\x2c\x6c\xb4\x59\xc1\x42\x1b\xc0\x24\x11\xbc\x30\x4a\x10\x6a\xa1\x4d\x16\x60\x18\x4a\xd1\x24\x42\xa5\x10\xeb\x7c\x6b\x44\xba\x74\xa0\x37\x8a\x8c\x5d\x8a\x7c\xd8\xeb\xc3\x8c\xc5\x88\x3e\x54\x48\x6c\x60\xeb\xd7\x74\x1a\x7e\xd1\x45\x29\x43\x43\xdc\x52\x0b\xb7\xf0\x95\x8c\xe5\x45\xfe\x38\xfc\x43\xaf\x0f\x3f\xf0\x94\x9b\xf2\xe5\xcd\x8f\x7f\x81\xad\x2e\x20\xc3\x2d\x28\xed\xa0\xb0\xd4\xe0\x4c\xdf\x62\xca\x1d\x08\x05\xb1\xce\x72\x29\x50\xc5\xb4\x13\xab\x5e\x61\x08\x1e\x00\xf3\xd0\x73\x87\x42\x01\x7a\x31\x40\x2f\x9a\xd3\x00\x5d\xaf\xdf\xeb\x83\x1f\x4b\xe7\xf2\xf1\x68\xb4\xd9\x6c\x86\xe8\xe1\x0e\xb5\x49\x47\x95\x74\xa3\x4f\xd3\xc9\xfb\xfb\xe8\xfd\xc0\x43\xee\xf5\xe1\x8b\x92\x64\x2d\x18\xfa\x67\x21\x0c\x25\x30\xdf\x02\xe6\xb9\x14\x31\xce\x25\x81\xc4\x0d\x1b\xce\x5b\xc7\x1b\x5d\x28\xd8\x18\xe1\x84\x4a\x6f\xc1\x96\x56\xef\xf5\xf7\xac\xb3\x53\x57\x05\x4f\xd8\xbd\x09\x5a\x01\x2a\xb8\xb9\x8b\x60\x1a\xdd\xc0\x4f\x77\xd1\x34\xba\xed\xf5\xe1\xe7\xe9\xec\x6f\x0f\x5f\x66\xf0\xf3\xdd\xd3\xd3\xdd\xfd\x6c\xfa\x3e\x82\x87\x27\x98\x3c\xdc\xbf\x9b\xce\xa6\x0f\xf7\x11\x3c\x7c\x80\xbb\xfb\x5f\xe0\xe3\xf4\xfe\xdd\x2d\x90\x70\x4b\x32\x40\xdf\x72\xc3\xf8\xb5\x01\xc1\x8a\xa4\x84\x6d\x5a\x39\x50\x05\x80\xfd\x83\xff\xb6\x39\xc5\x62\x21\x62\x90\xa8\xd2\x02\x53\x82\x54\xaf\xc9\x28\x76\x8f\x9c\x4c\x26\x2c\x9b\xd3\x02\xaa\xa4\xd7\x07\x29\x32\xe1\xbc\x17\xd9\x63\xa1\x78\x99\xef\x19\x5b\x3d\xcc\x45\xe9\x4e\x63\xc0\x5c\xd0\x37\x47\xca\xa3\x19\xae\xfe\x6c\x87\x42\x8f\xd6\x6f\xe7\xe4\xf0\x6d\x6f\x25\x54\x32\x86\x49\x61\x9d\xce\x9e\xc8\xea\xc2\xc4\xf4\x8e\x16\x42\x79\xf7\xef\x65\xe4\x30\x41\x87\xe3\x1e\x80\xc2\x8c\xc6\x20\x94\xa3\xd4\x78\x41\x72\x89\x8e\x63\xc3\x0e\x63\xcc\x48\x36\x3c\xa4\x07\x20\x71\x4e\xd2\x32\x1d\xb0\x0f\x8c\xe1\xc6\x4f\x1a\xac\x6e\x7a\xac\x38\x7e\xb1\x0b\xb2\x47\xc3\x6c\xcd\x44\xcb\x22\x53\x25\xd1\x00\xfe\x1e\x3d\xdc\x3f\xa2\x5b\x8e\x61\x68\x1d\xba\xc2\x0e\xf3\x25\x5a\xea\x05\xd7\x4c\xc8\xc6\x46\xe4\xce\xcb\xc8\x71\xd7\x40\x06\x15\x34\x68\x52\x04\x01\x1e\x1b\x4f\xdc\x36\xa7\x31\xb0\x33\x29\xc6\x9c\x1a\x5d\xe4\x63\x68\x91\x86\x49\x4b\x5c\x41\x63\xd3\xdd\x62\x8f\xe5\x5a\xfe\xad\x14\xd6\x7d\xec\x9a\xf1\x49\x58\xe7\x67\xe5\xb2\x30\x28\xdb\x95\xe9\x27\xd8\xa5\x36\xee\x7e\xb7\x28\xab\x43\xe4\xe1\x95\x50\x69\x21\xd1\xb4\x52\xf7\x00\x6c\xac\x59\x28\x4f\x9c\x63\x4c\x09\x3f\x2b\xe6\xa6\x34\x6e\xc9\x30\x28\x74\x0c\xff\xfa\x77\x0f\x60\x8d\x52\x84\x44\x1b\x5e\xea\x9c\xd4\xdd\xe3\xf4\xeb\x9f\xa2\x78\x49\x19\x8e\xdb\x34\xde\x22\x1e\x87\x26\x3b\x75\xa0\xaa\xe3\xa4\x53\x48\x1e\x77\x8f\xd3\xf2\xff\xb9\xd1\x39\x19\x27\x76\x22\xb3\xe3\xd4\x6e\x5c\x3f\x3b\xc0\xf1\x86\x81\x96\x99\x33\x61\xc7\xa5\x00\x62\x1d\x9e\x51\x02\x36\xc0\xf1\x59\x4e\x70\x72\xe2\x20\x27\x15\x82\xb1\xc1\x16\x78\x0a\x2a\xd0\xf3\x7f\x50\xec\x86\x10\x91\x61\x26\x6c\x8b\x42\x26\xbc\xd1\xac\xc9\x38\x30\x14\xeb\x54\x89\x5f\x6b\xce\xb6\xda\xbf\x24\x3a\x2a\x0d\x5c\x0d\xef\xd6\xbc\x8b\xac\x51\x16\x74\xcb\xb9\xc0\x27\x60\x43\xbc\x06\x14\xaa\xc1\xcd\x4f\xb1\x43\xf8\xac\x0d\xf9\x5d\x67\xec\xd3\xaf\x1d\x8f\x46\xa9\x70\x55\xe0\xc6\x3a\xcb\x0a\x25\xdc\x76\xd4\xd8\xf9\xec\x28\xa1\x35\xc9\x91\x15\xe9\x00\x4d\xbc\x14\x8e\x62\x57\x18\x1a\x61\x2e\x06\x1e\xb8\xf2\x99\x67\x98\x25\xfd\xda\x11\xde\x34\x90\x1e\x04\x42\x18\xde\xd3\x3b\xf5\xce\x5e\xce\x16\xc7\x92\x2c\xe0\xdf\xa9\x97\x1f\xb1\x56\x9e\xde\x47\x33\xa8\x16\xf5\x26\xd8\xd7\xb9\xd7\xf6\x8e\xcc\xee\x14\xcf\x8a\x12\x6a\xe1\x53\x25\xef\x75\x46\x67\x9e\x23\xa9\x24\xd7\x42\x39\xff\x47\x2c\x05\xa9\x7d\xa5\xdb\x62\x9e\x09\x17\xb6\x21\xb2\x8e\xed\x33\x84\x09\x2a\xde\x39\xe7\x04\x45\x9e\xa0\xa3\x64\x08\x53\x05\x13\x0e\xf5\x09\xf2\xe6\xf8\x1b\xab\x9d\x35\x6c\x07\xac\xd2\xf3\x8a\x6f\x66\xdd\xfd\x89\x41\x5b\xf5\xe3\x2a\x93\xb6\x5a\xa8\x25\x42\xa3\x9c\xe2\xbd\x28\x49\xc8\xfa\x8d\x9a\xd3\x01\xb1\xff\x77\xe5\xb5\xee\x18\xe5\x31\x2f\x84\x4c\xf6\x1f\x9d\x07\xf3\x13\x13\x79\x44\xac\x52\x14\xca\xee\xd2\xb6\x21\x0e\xa6\xe4\x80\x63\xb9\x50\xb3\x24\x3b\x98\xd1\x05\xd0\xd3\xa2\xa5\x69\x86\x29\x1d\xbf\xea\xb0\xc3\xde\xaa\x91\x33\xe8\x28\xdd\xb6\x51\x5f\x26\x6a\xc9\x00\x48\x15\x19\xf1\xff\x2d\xa0\x94\xbe\xd4\xf0\xd5\x6a\x8b\xbc\x3b\x99\x6d\xa0\x16\x64\x9f\x8b\x9e\xbd\xf9\xd1\xe8\x6f\xdb\x88\x62\x43\xee\xd9\xd2\xaf\x50\x89\x95\xf6\x22\x4c\x78\x4b\xec\x66\x30\xd7\x5a\x12\x1e\xda\x04\x20\xc3\x35\xa9\xb3\x7a\xfb\xcc\xb3\xbc\x3f\x0c\x06\x2d\x73\x4f\x99\x96\x87\xd4\x31\xca\x27\xca\xb5\x15\x4e\x9b\x56\x33\x9d\x15\x95\x87\x25\xc7\xb9\xab\x63\x95\x03\xcc\x5f\x39\xe7\x45\x21\xb5\xb5\xa2\xbe\x04\x39\x8f\x58\xab\x85\x48\x3f\x63\xfe\x91\xb6\x4f\xb4\xe8\x9e\x78\x00\x20\x22\x49\xb1\xe3\x2c\xbc\x22\x5f\xc9\x23\x4c\x2a\x56\xc3\x13\x4c\x2e\xc1\xc4\x63\x45\x9d\x9a\x6c\xc5\xc3\x85\x18\x23\x71\x1a\xac\x87\x76\x0a\x04\x5c\x62\x8f\x6a\xf8\xea\xed\x39\x50\xde\x70\x09\x54\x1d\x6e\x0c\x2d\xc8\x90\x72\xad\x79\x7e\x55\xcc\xc9\x28\x72\xe4\x53\x7d\xa2\x63\xcb\x59\x9e\x0f\x55\x76\xc4\x25\xfd\x5a\xd0\x66\xc4\x67\x43\xa1\xd2\x01\x1f\xac\x06\x21\x0f\xdb\x91\xaf\x0b\x47\x7d\xff\xcf\x19\x6c\x00\xb3\x87\x77\x0f\x63\xb8\x4b\x12\xd0\xfe\xb8\x51\x58\x5a\x14\x12\x16\x82\x64\x62\x87\x8d\x62\xe7\xd6\x6f\xbd\xb7\x50\x88\xe4\xaf\x6f\xbe\x97\xfe\x74\x1e\x6a\xed\x67\xe9\x30\xf2\x67\x9c\x2d\x6c\x96\xe4\x21\xb3\x2a\x6b\xff\xf2\xe7\x24\x67\xd9\xde\x67\x65\xcf\x0a\xeb\x37\xdf\xb0\xf9\xb4\x27\xba\x43\xa1\xba\xd2\xc9\x6e\x54\x07\xcd\xd3\x32\x0d\xce\x20\x6c\xdd\x5a\x0f\x87\xf5\xc9\xf3\xf5\xd1\x19\xf8\xfc\x2f\x43\xb3\x8c\x88\x00\x64\x17\xa8\xbe\xbe\x1a\x02\x7c\x2e\x6c\xb7\x16\xaa\x31\x27\xc0\x70\x6c\xa8\xf8\xac\x68\x7b\x0d\xf5\x7a\xfc\x4e\x42\x3d\x54\x0c\x8d\x38\xf7\x71\x7c\x89\x77\xfc\x9f\xc6\xf9\xd9\x29\x4e\x64\xa4\x8b\xd6\x22\x0a\xce\x9b\xe8\x24\xfb\x9c\x3d\xc2\x3a\x52\xee\xab\x96\x45\x46\x13\x89\x22\x7b\x76\xb5\x76\x3a\x7b\x34\x5b\x2e\xa7\xb3\xcc\xab\x24\x29\xe6\x52\xd8\xe5\xab\x2b\xe6\xc7\x7d\x3e\x8d\xc2\xb9\x15\xf2\x41\x31\x5d\xc1\x78\x45\xe9\x6c\x28\x15\xd6\xb5\x17\x93\xe7\x24\x78\x2a\x69\x5f\x5e\xd1\x62\x92\x18\xb2\x9d\xbb\xc0\xd9\x74\x10\xe3\x8b\x49\x85\xb2\x14\x17\xa6\x33\x0b\x9f\x0f\x5c\x6d\x52\x54\xe2\xd7\x46\x57\xe9\x05\x30\x6c\xe7\x89\xe5\x02\xf2\x93\x2e\x6a\x0a\xc5\xa1\xfc\x68\xf4\x5a\x24\x64\xce\x1a\xf8\x69\x7f\x7e\xbb\x41\x4f\xfb\x52\xe0\xd0\xd2\xcf\xba\x88\xfc\x44\xe2\x39\x41\xd7\xa9\x83\x58\x16\xd6\x1d\xcb\x7d\xce\xa9\x27\x81\xac\xea\xf4\xf1\xde\xc5\xdb\xae\x36\xf1\x92\x7c\x98\x1d\x1f\xc9\xeb\xb5\x3c\x45\xde\xe8\x15\x0a\x65\x1d\x4a\x49\x7c\xa0\x77\xba\x15\x79\x8b\x50\xe1\xa4\x54\x98\x56\xcf\x12\x8e\xb2\x96\x80\xd9\x13\x6b\xd2\x64\xd0\x15\x9d\xa7\x63\xd3\x83\x7b\x49\xda\xf4\x3d\xb2\x17\x50\x9e\xda\x00\x07\x9e\xb4\xf5\x85\x5f\xee\xd8\x95\xba\x03\x23\xbc\x42\x63\x70\x7f\x23\xcd\x8d\x5e\x08\x79\x84\x7c\xbf\xbe\x34\x28\xdc\x63\x98\xd8\xe8\xe7\xf9\x96\xb8\xf5\xc5\x19\x4f\x60\xc7\x41\x07\x68\x08\x48\xe1\x5c\xb6\xd4\x08\x47\x17\x2c\xa5\xa3\x78\x83\x8d\x1a\xed\xe4\x4b\x5d\xe6\xa0\xf7\xdd\x81\xbf\x35\x87\x97\x84\xcf\x6c\x53\xd5\x0b\x3e\xa3\x3d\xb5\x12\xae\xd5\xd7\x3a\x5c\xfa\xa4\xc0\xcd\xd7\xc7\xc6\x3c\xe1\x01\xc1\x44\x87\xab\x5d\x56\x35\xec\x29\xf3\x2e\xb8\xc3\xbe\xde\x7c\xbf\xb6\x19\x7d\xe1\x48\xe4\x17\x7d\x66\x04\x9e\xcc\x02\xcf\x41\x7d\x91\x26\xcf\x6c\x26\x67\x03\xea\xe8\x55\x7b\x37\x37\xdc\xc9\xf4\x3a\x54\xda\xd6\xcf\xf5\x14\x7b\x1d\x5d\x3d\xb7\x64\xd6\xd7\x96\xee\xb5\xa5\x7b\x6d\xe9\x56\xe3\xda\xd2\x6d\x8e\x6b\x4b\xf7\xda\xe7\xb9\xb6\x74\xaf\x2d\xdd\x83\x71\x6d\xe9\x9e\x1e\xbf\x93\x50\xbf\xb6\x74\x8f\x26\x5c\x5b\xba\x17\x48\x72\x6d\xe9\x5e\x5b\xba\xd7\x96\x6e\xeb\x8a\xd7\x96\xee\xeb\x5b\xba\x21\x87\x1d\x05\xc6\x25\xfd\xdc\x36\x99\x2a\x86\xe5\xcc\x79\xd9\x1c\xa9\x7b\x22\xd8\xa2\xf3\xfa\x1b\x45\x74\x80\x10\x93\xf1\xdf\xc8\xfb\x2f\x0d\x8f\xcb\xa0\xd3\x81\x2e\xd1\xba\x99\x41\x65\x3d\x88\x99\xe8\xaa\x7d\xf6\xe4\xf8\x84\xd6\x79\x9f\xa8\xfa\x64\xa5\x08\xae\x66\x44\x49\xf8\x08\x52\x2b\x2a\x9b\x45\x5d\x61\xa4\x01\x95\x2f\x53\xda\x0b\xb8\xd0\x6b\x19\x43\x82\x8e\x06\xbc\xe4\x4b\xf6\x0b\x16\xf2\x8b\xff\x96\xf2\x42\x01\x67\xfe\x1b\xd9\x9d\x90\xc2\x36\xa4\xdc\xa0\xad\xbf\xcc\xfc\xed\x30\x67\x64\x6d\x47\xbb\xe8\xa8\x81\xb9\x2c\x32\x54\x60\x08\x13\xff\xeb\x85\x92\x14\x84\x4a\x44\x8c\xfe\xf3\xd6\x84\x1c\x0a\x69\x01\xe7\xba\xe8\x2c\x3f\x96\xd4\xb0\x60\xbb\x68\x67\x40\x1b\x42\xdb\x95\x71\x8f\x14\x1c\x26\xd7\x3d\xf4\x5a\xc1\x6f\x6c\xa9\xfb\xd7\x61\x39\xee\x51\x76\x60\x29\x5b\x93\x65\x01\x5f\xc3\xb8\x0d\x3f\xdf\x59\xc0\xcc\x14\x74\x0b\x1f\x50\x5a\xba\x85\x2f\x6a\xa5\xf4\xe6\x65\x88\xba\xef\x62\xf6\x75\xb3\xcd\xfd\xba\xcd\x5f\x09\xd4\xa8\x5e\xb0\xf0\xe9\x1b\x99\xce\xe8\xec\xb8\xac\x79\xc1\x95\xcc\xf5\x1e\xec\x60\xfc\x57\xee\xc1\x96\x68\x4f\xdf\x82\xb5\xec\x46\xfe\x17\x27\xc7\xca\xed\x14\xf4\x7a\xd9\x76\xbd\x6c\xbb\x5e\xb6\x7d\xbf\xcb\x36\xa8\x7e\x0c\x74\x08\xa8\x03\x48\x0b\x9b\x83\x47\x15\x3f\x58\xbf\xdd\xfd\x55\xff\x6e\x2d\xfc\xce\xcc\xbf\x02\x7f\xe2\x31\x6b\x4a\xc6\xe0\x4c\x9d\x83\xac\xd3\x86\xcb\x90\xf0\xec\x3f\x01\x00\x00\xff\xff\x79\x01\x04\xd4\x58\x3b\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x5f\x8f\xdb\xb8\x11\x7f\xf7\xa7\x18\xac\x1f\x72\x07\xac\xed\xa6\x7d\x29\xdc\x87\x62\xcf\x49\x50\x37\xc9\xee\x62\xe5\xe4\x70\x8f\x63\x69\x2c\xb3\xa6\x48\x95\xa4\xec\xf8\x8a\x7e\xf7\x62\x48\x49\x96\x6d\xc9\xf6\xee\xe6\x5a\xf4\x60\xbe\x24\x2b\x71\x86\xbf\xf9\xcb\xe1\x50\xee\xc3\xe0\xfb\x8d\x5e\x1f\x3e\x89\x98\x94\xa5\x04\x9c\x06\xb7\x24\xb8\xcb\x31\x5e\x12\x44\x7a\xe1\x36\x68\x08\x3e\xe8\x42\x25\xe8\x84\x56\xf0\xc3\x5d\xf4\xe1\x47\x28\x54\x42\x06\xb4\x22\xd0\x06\x32\x6d\xa8\xd7\x87\x58\x2b\x67\xc4\xbc\x70\xda\x80\x0c\x0c\x01\x53\x43\x94\x91\x72\x76\x08\x10\x11\x79\xee\xf7\x0f\xb3\xe9\xe4\x3d\x2c\x84\x24\x48\x84\x0d\x44\x94\xc0\x46\xb8\x65\xaf\x0f\x6e\x29\x2c\x6c\xb4\x59\xc1\x42\x1b\xc0\x24\x11\xbc\x30\x4a\x10\x6a\xa1\x4d\x16\x60\x18\x4a\xd1\x24\x42\xa5\x10\xeb\x7c\x6b\x44\xba\x74\xa0\x37\x8a\x8c\x5d\x8a\x7c\xd8\xeb\xc3\x8c\xc5\x88\x3e\x54\x48\x6c\x60\xeb\xd7\x74\x1a\x7e\xd1\x45\x29\x43\x43\xdc\x52\x0b\xb7\xf0\x95\x8c\xe5\x45\xfe\x38\xfc\x43\xaf\x0f\x3f\xf0\x94\x9b\xf2\xe5\xcd\x8f\x7f\x81\xad\x2e\x20\xc3\x2d\x28\xed\xa0\xb0\xd4\xe0\x4c\xdf\x62\xca\x1d\x08\x05\xb1\xce\x72\x29\x50\xc5\xb4\x13\xab\x5e\x61\x08\x1e\x00\xf3\xd0\x73\x87\x42\x01\x7a\x31\x40\x2f\x9a\xd3\x00\x5d\xaf\xdf\xeb\x83\x1f\x4b\xe7\xf2\xf1\x68\xb4\xd9\x6c\x86\xe8\xe1\x0e\xb5\x49\x47\x95\x74\xa3\x4f\xd3\xc9\xfb\xfb\xe8\xfd\xc0\x43\xee\xf5\xe1\x8b\x92\x64\x2d\x18\xfa\x67\x21\x0c\x25\x30\xdf\x02\xe6\xb9\x14\x31\xce\x25\x81\xc4\x0d\x1b\xce\x5b\xc7\x1b\x5d\x28\xd8\x18\xe1\x84\x4a\x6f\xc1\x96\x56\xef\xf5\xf7\xac\xb3\x53\x57\x05\x4f\xd8\xbd\x09\x5a\x01\x2a\xb8\xb9\x8b\x60\x1a\xdd\xc0\x4f\x77\xd1\x34\xba\xed\xf5\xe1\xe7\xe9\xec\x6f\x0f\x5f\x66\xf0\xf3\xdd\xd3\xd3\xdd\xfd\x6c\xfa\x3e\x82\x87\x27\x98\x3c\xdc\xbf\x9b\xce\xa6\x0f\xf7\x11\x3c\x7c\x80\xbb\xfb\x5f\xe0\xe3\xf4\xfe\xdd\x2d\x90\x70\x4b\x32\x40\xdf\x72\xc3\xf8\xb5\x01\xc1\x8a\xa4\x84\x6d\x5a\x39\x50\x05\x80\xfd\x83\xff\xb6\x39\xc5\x62\x21\x62\x90\xa8\xd2\x02\x53\x82\x54\xaf\xc9\x28\x76\x8f\x9c\x4c\x26\x2c\x9b\xd3\x02\xaa\xa4\xd7\x07\x29\x32\xe1\xbc\x17\xd9\x63\xa1\x78\x99\xef\x19\x5b\x3d\xcc\x45\xe9\x4e\x63\xc0\x5c\xd0\x37\x47\xca\xa3\x19\xae\xfe\x6c\x87\x42\x8f\xd6\x6f\xe7\xe4\xf0\x6d\x6f\x25\x54\x32\x86\x49\x61\x9d\xce\x9e\xc8\xea\xc2\xc4\xf4\x8e\x16\x42\x79\xf7\xef\x65\xe4\x30\x41\x87\xe3\x1e\x80\xc2\x8c\xc6\x20\x94\xa3\xd4\x78\x41\x72\x89\x8e\x63\xc3\x0e\x63\xcc\x48\x36\x3c\xa4\x07\x20\x71\x4e\xd2\x32\x1d\xb0\x0f\x8c\xe1\xc6\x4f\x1a\xac\x6e\x7a\xac\x38\x7e\xb1\x0b\xb2\x47\xc3\x6c\xcd\x44\xcb\x22\x53\x25\xd1\x00\xfe\x1e\x3d\xdc\x3f\xa2\x5b\x8e\x61\x68\x1d\xba\xc2\x0e\xf3\x25\x5a\xea\x05\xd7\x4c\xc8\xc6\x46\xe4\xce\xcb\xc8\x71\xd7\x40\x06\x15\x34\x68\x52\x04\x01\x1e\x1b\x4f\xdc\x36\xa7\x31\xb0\x33\x29\xc6\x9c\x1a\x5d\xe4\x63\x68\x91\x86\x49\x4b\x5c\x41\x63\xd3\xdd\x62\x8f\xe5\x5a\xfe\xad\x14\xd6\x7d\xec\x9a\xf1\x49\x58\xe7\x67\xe5\xb2\x30\x28\xdb\x95\xe9\x27\xd8\xa5\x36\xee\x7e\xb7\x28\xab\x43\xe4\xe1\x95\x50\x69\x21\xd1\xb4\x52\xf7\x00\x6c\xac\x59\x28\x4f\x9c\x63\x4c\x09\x3f\x2b\xe6\xa6\x34\x6e\xc9\x30\x28\x74\x0c\xff\xfa\x77\x0f\x60\x8d\x52\x84\x44\x1b\x5e\xea\x9c\xd4\xdd\xe3\xf4\xeb\x9f\xa2\x78\x49\x19\x8e\xdb\x34\xde\x22\x1e\x87\x26\x3b\x75\xa0\xaa\xe3\xa4\x53\x48\x1e\x77\x8f\xd3\xf2\xff\xb9\xd1\x39\x19\x27\x76\x22\xb3\xe3\xd4\x6e\x5c\x3f\x3b\xc0\xf1\x86\x81\x96\x99\x33\x61\xc7\xa5\x00\x62\x1d\x9e\x51\x02\x36\xc0\xf1\x59\x4e\x70\x72\xe2\x20\x27\x15\x82\xb1\xc1\x16\x78\x0a\x2a\xd0\xf3\x7f\x50\xec\x86\x10\x91\x61\x26\x6c\x8b\x42\x26\xbc\xd1\xac\xc9\x38\x30\x14\xeb\x54\x89\x5f\x6b\xce\xb6\xda\xbf\x24\x3a\x2a\x0d\x5c\x0d\xef\xd6\xbc\x8b\xac\x51\x16\x74\xcb\xb9\xc0\x27\x60\x43\xbc\x06\x14\xaa\xc1\xcd\x4f\xb1\x43\xf8\xac\x0d\xf9\x5d\x67\xec\xd3\xaf\x1d\x8f\x46\xa9\x70\x55\xe0\xc6\x3a\xcb\x0a\x25\xdc\x76\xd4\xd8\xf9\xec\x28\xa1\x35\xc9\x91\x15\xe9\x00\x4d\xbc\x14\x8e\x62\x57\x18\x1a\x61\x2e\x06\x1e\xb8\xf2\x99\x67\x98\x25\xfd\xda\x11\xde\x34\x90\x1e\x04\x42\x18\xde\xd3\x3b\xf5\xce\x5e\xce\x16\xc7\x92\x2c\xe0\xdf\xa9\x97\x1f\xb1\x56\x9e\xde\x47\x33\xa8\x16\xf5\x26\xd8\xd7\xb9\xd7\xf6\x8e\xcc\xee\x14\xcf\x8a\x12\x6a\xe1\x53\x25\xef\x75\x46\x67\x9e\x23\xa9\x24\xd7\x42\x39\xff\x47\x2c\x05\xa9\x7d\xa5\xdb\x62\x9e\x09\x17\xb6\x21\xb2\x8e\xed\x33\x84\x09\x2a\xde\x39\xe7\x04\x45\x9e\xa0\xa3\x64\x08\x53\x05\x13\x0e\xf5\x09\xf2\xe6\xf8\x1b\xab\x9d\x35\x6c\x07\xac\xd2\xf3\x8a\x6f\x66\xdd\xfd\x89\x41\x5b\xf5\xe3\x2a\x93\xb6\x5a\xa8\x25\x42\xa3\x9c\xe2\xbd\x28\x49\xc8\xfa\x8d\x9a\xd3\x01\xb1\xff\x77\xe5\xb5\xee\x18\xe5\x31\x2f\x84\x4c\xf6\x1f\x9d\x07\xf3\x13\x13\x79\x44\xac\x52\x14\xca\xee\xd2\xb6\x21\x0e\xa6\xe4\x80\x63\xb9\x50\xb3\x24\x3b\x98\xd1\x05\xd0\xd3\xa2\xa5\x69\x86\x29\x1d\xbf\xea\xb0\xc3\xde\xaa\x91\x33\xe8\x28\xdd\xb6\x51\x5f\x26\x6a\xc9\x00\x48\x15\x19\xf1\xff\x2d\xa0\x94\xbe\xd4\xf0\xd5\x6a\x8b\xbc\x3b\x99\x6d\xa0\x16\x64\x9f\x8b\x9e\xbd\xf9\xd1\xe8\x6f\xdb\x88\x62\x43\xee\xd9\xd2\xaf\x50\x89\x95\xf6\x22\x4c\x78\x4b\xec\x66\x30\xd7\x5a\x12\x1e\xda\x04\x20\xc3\x35\xa9\xb3\x7a\xfb\xcc\xb3\xbc\x3f\x0c\x06\x2d\x73\x4f\x99\x96\x87\xd4\x31\xca\x27\xca\xb5\x15\x4e\x9b\x56\x33\x9d\x15\x95\x87\x25\xc7\xb9\xab\x63\x95\x03\xcc\x5f\x39\xe7\x45\x21\xb5\xb5\xa2\xbe\x04\x39\x8f\x58\xab\x85\x48\x3f\x63\xfe\x91\xb6\x4f\xb4\xe8\x9e\x78\x00\x20\x22\x49\xb1\xe3\x2c\xbc\x22\x5f\xc9\x23\x4c\x2a\x56\xc3\x13\x4c\x2e\xc1\xc4\x63\x45\x9d\x9a\x6c\xc5\xc3\x85\x18\x23\x71\x1a\xac\x87\x76\x0a\x04\x5c\x62\x8f\x6a\xf8\xea\xed\x39\x50\xde\x70\x09\x54\x1d\x6e\x0c\x2d\xc8\x90\x72\xad\x79\x7e\x55\xcc\xc9\x28\x72\xe4\x53\x7d\xa2\x63\xcb\x59\x9e\x0f\x55\x76\xc4\x25\xfd\x5a\xd0\x66\xc4\x67\x43\xa1\xd2\x01\x1f\xac\x06\x21\x0f\xdb\x91\xaf\x0b\x47\x7d\xff\xcf\x19\x6c\x00\xb3\x87\x77\x0f\x63\xb8\x4b\x12\xd0\xfe\xb8\x51\x58\x5a\x14\x12\x16\x82\x64\x62\x87\x8d\x62\xe7\xd6\x6f\xbd\xb7\x50\x88\xe4\xaf\x6f\xbe\x97\xfe\x74\x1e\x6a\xed\x67\xe9\x30\xf2\x67\x9c\x2d\x6c\x96\xe4\x21\xb3\x2a\x6b\xff\xf2\xe7\x24\x67\xd9\xde\x67\x65\xcf\x0a\xeb\x37\xdf\xb0\xf9\xb4\x27\xba\x43\xa1\xba\xd2\xc9\x6e\x54\x07\xcd\xd3\x32\x0d\xce\x20\x6c\xdd\x5a\x0f\x87\xf5\xc9\xf3\xf5\xd1\x19\xf8\xfc\x2f\x43\xb3\x8c\x88\x00\x64\x17\xa8\xbe\xbe\x1a\x02\x7c\x2e\x6c\xb7\x16\xaa\x31\x27\xc0\x70\x6c\xa8\xf8\xac\x68\x7b\x0d\xf5\x7a\xfc\x4e\x42\x3d\x54\x0c\x8d\x38\xf7\x71\x7c\x89\x77\xfc\x9f\xc6\xf9\xd9\x29\x4e\x64\xa4\x8b\xd6\x22\x0a\xce\x9b\xe8\x24\xfb\x9c\x3d\xc2\x3a\x52\xee\xab\x96\x45\x46\x13\x89\x22\x7b\x76\xb5\x76\x3a\x7b\x34\x5b\x2e\xa7\xb3\xcc\xab\x24\x29\xe6\x52\xd8\xe5\xab\x2b\xe6\xc7\x7d\x3e\x8d\xc2\xb9\x15\xf2\x41\x31\x5d\xc1\x78\x45\xe9\x6c\x28\x15\xd6\xb5\x17\x93\xe7\x24\x78\x2a\x69\x5f\x5e\xd1\x62\x92\x18\xb2\x9d\xbb\xc0\xd9\x74\x10\xe3\x8b\x49\x85\xb2\x14\x17\xa6\x33\x0b\x9f\x0f\x5c\x6d\x52\x54\xe2\xd7\x46\x57\xe9\x05\x30\x6c\xe7\x89\xe5\x02\xf2\x93\x2e\x6a\x0a\xc5\xa1\xfc\x68\xf4\x5a\x24\x64\xce\x1a\xf8\x69\x7f\x7e\xbb\x41\x4f\xfb\x52\xe0\xd0\xd2\xcf\xba\x88\xfc\x44\xe2\x39\x41\xd7\xa9\x83\x58\x16\xd6\x1d\xcb\x7d\xce\xa9\x27\x81\xac\xea\xf4\xf1\xde\xc5\xdb\xae\x36\xf1\x92\x7c\x98\x1d\x1f\xc9\xeb\xb5\x3c\x45\xde\xe8\x15\x0a\x65\x1d\x4a\x49\x7c\xa0\x77\xba\x15\x79\x8b\x50\xe1\xa4\x54\x98\x56\xcf\x12\x8e\xb2\x96\x80\xd9\x13\x6b\xd2\x64\xd0\x15\x9d\xa7\x63\xd3\x83\x7b\x49\xda\xf4\x3d\xb2\x17\x50\x9e\xda\x00\x07\x9e\xb4\xf5\x85\x5f\xee\xd8\x95\xba\x03\x23\xbc\x42\x63\x70\x7f\x23\xcd\x8d\x5e\x08\x79\x84\x7c\xbf\xbe\x34\x28\xdc\x63\x98\xd8\xe8\xe7\xf9\x96\xb8\xf5\xc5\x19\x4f\x60\xc7\x41\x07\x68\x08\x48\xe1\x5c\xb6\xd4\x08\x47\x17\x2c\xa5\xa3\x78\x83\x8d\x1a\xed\xe4\x4b\x5d\xe6\xa0\xf7\xdd\x81\xbf\x35\x87\x97\x84\xcf\x6c\x53\xd5\x0b\x3e\xa3\x3d\xb5\x12\xae\xd5\xd7\x3a\x5c\xfa\xa4\xc0\xcd\xd7\xc7\xc6\x3c\xe1\x01\xc1\x44\x87\xab\x5d\x56\x35\x9c\x75\xab\xa3\x57\xed\x3d\xcd\x70\x33\xd1\x98\x76\xb6\xab\xe9\x29\xf6\xfa\x9a\x7a\x6e\xc9\xac\xaf\x8d\xcd\x6b\x63\xf3\xda\xd8\xac\xc6\xb5\xb1\xd9\x1c\xd7\xc6\xe6\xb5\xdb\x71\x6d\x6c\x5e\x1b\x9b\x07\xe3\xda\xd8\x3c\x3d\x7e\x27\xa1\x7e\x6d\x6c\x1e\x4d\xb8\x36\x36\x2f\x90\xe4\xda\xd8\xbc\x36\x36\xaf\x8d\xcd\xd6\x15\xaf\x8d\xcd\xd7\x37\x36\x43\x0e\x3b\x0a\x8c\x4b\xba\x9a\x6d\x32\x55\x0c\xcb\x99\xf3\xb2\x39\x52\xf7\x44\xb0\x45\xe7\xf5\x97\x7a\xe8\x00\x21\x26\xe3\xbf\x14\xf7\xdf\xdb\x1d\x97\x41\xa7\x03\x5d\xa2\x75\x33\x83\xca\x7a\x10\x33\xd1\x55\xfb\xec\xc9\xf1\x09\xad\xf3\x3e\x11\xbe\xee\xab\x45\x70\x35\x23\x4a\xc2\xa7\x80\x5a\x51\xd9\x2c\xea\x0a\x23\x0d\xa8\x7c\x99\xd2\x5e\xc0\x85\x5e\xcb\x18\x12\x74\x34\xe0\x25\x5f\xb2\x5f\xb0\x90\x5f\xfc\x17\x85\x17\x0a\x38\xf3\x5f\x8a\xee\x84\x14\xb6\x21\xe5\x06\x6d\xfd\x7d\xe2\x6f\x87\x39\x23\x6b\x3b\xda\x45\x07\x60\xef\x60\x59\x64\xa8\xc0\x10\x26\xfe\x1b\xfe\x92\x14\x84\x4a\x44\x8c\xfe\x23\xcf\x84\x1c\x0a\x69\x01\xe7\xba\xe8\x2c\x3f\x96\xd4\xb0\x60\xbb\x68\x67\x40\x1b\x42\xdb\x95\x71\x8f\x14\x1c\x26\xd7\x9d\xe4\x5a\xc1\x6f\x6c\xa9\xfb\xd7\x61\x39\xee\x51\x76\x60\x29\x5b\x93\x65\x01\x5f\xc3\xb8\x0d\x3f\x62\x59\xc0\xcc\x14\x74\x0b\x1f\x50\x5a\xba\x85\x2f\x6a\xa5\xf4\xe6\x65\x88\xba\x6f\x24\xf6\x75\xb3\xcd\xfd\xba\xcd\x6f\xe5\x6b\x54\x2f\x58\xf8\xf4\xbd\x44\x67\x74\x76\x5c\x59\xbc\xe0\x62\xe2\x7a\x1b\x74\x30\xfe\x2b\xb7\x41\x4b\xb4\xa7\xef\x82\x5a\x76\x23\xff\xbb\x8b\x63\xe5\x76\x0a\x7a\xbd\x72\xba\x5e\x39\x7d\xff\x2b\x27\xa8\x7e\x18\x72\xc8\xac\x43\xb0\x16\x36\x07\x8f\x2a\x7e\xb0\x7e\xbb\xfb\xab\xfe\x0d\x53\xf8\xcd\x91\x7f\x05\xbe\xee\x37\x6b\x4a\xc6\xe0\x4c\x1d\x89\xd6\x69\xc3\x9b\x71\x78\xf6\x9f\x00\x00\x00\xff\xff\x1a\xba\x87\x0e\x64\x39\x00\x00"), }, "/crd-integration.yaml": &vfsgen۰CompressedFileInfo{ name: "crd-integration.yaml", modTime: time.Time{}, - uncompressedSize: 11528, + uncompressedSize: 11511, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1a\x4d\x73\xe2\x38\xf6\xee\x5f\xf1\x2a\x1c\x7a\xa6\x2a\xc0\xf6\xcc\x65\x8b\x3d\xb1\x74\x52\xcb\x76\x9a\xa4\x80\x9e\xa9\x39\x0a\xfb\x61\xb4\x91\x25\xad\x24\x43\xb2\x5b\xfb\xdf\xb7\x9e\x64\x1b\x1b\x6c\x42\x48\x77\x4d\x55\x57\x7c\xc3\x7a\xdf\xdf\x7a\xa6\x07\xfd\x6f\xf7\x44\x3d\xb8\xe3\x31\x4a\x8b\x09\x38\x05\x6e\x83\x30\xd6\x2c\xde\x20\x2c\xd4\xda\xed\x98\x41\xb8\x55\xb9\x4c\x98\xe3\x4a\xc2\x4f\xe3\xc5\xed\xcf\x90\xcb\x04\x0d\x28\x89\xa0\x0c\x64\xca\x60\xd4\x83\x58\x49\x67\xf8\x2a\x77\xca\x80\x08\x04\x81\xa5\x06\x31\x43\xe9\xec\x00\x60\x81\xe8\xa9\xcf\xee\x97\xd3\xc9\x0d\xac\xb9\x40\x48\xb8\x0d\x48\x98\xc0\x8e\xbb\x4d\xd4\x03\xb7\xe1\x16\x76\xca\x3c\xc2\x5a\x19\x60\x49\xc2\x89\x31\x13\xc0\xe5\x5a\x99\x2c\x88\x61\x30\x65\x26\xe1\x32\x85\x58\xe9\x67\xc3\xd3\x8d\x03\xb5\x93\x68\xec\x86\xeb\x41\xd4\x83\x25\xa9\xb1\xb8\x2d\x25\xb1\x81\xac\xe7\xe9\x14\xfc\xa1\xf2\x42\x87\x9a\xba\x85\x15\xae\xe1\x37\x34\x96\x98\xfc\x32\xf8\x4b\xd4\x83\x9f\x08\xe4\xaa\x38\xbc\xfa\xf9\x6f\xf0\xac\x72\xc8\xd8\x33\x48\xe5\x20\xb7\x58\xa3\x8c\x4f\x31\x6a\x07\x5c\x42\xac\x32\x2d\x38\x93\x31\xee\xd5\xaa\x38\x0c\xc0\x0b\x40\x34\xd4\xca\x31\x2e\x81\x79\x35\x40\xad\xeb\x60\xc0\x5c\xd4\x8b\x7a\xe0\x9f\x8d\x73\x7a\x34\x1c\xee\x76\xbb\x01\xf3\xe2\x0e\x94\x49\x87\xa5\x76\xc3\xbb\xe9\xe4\x66\xb6\xb8\xe9\x7b\x91\xa3\x1e\x7c\x95\x02\xad\x05\x83\xff\xce\xb9\xc1\x04\x56\xcf\xc0\xb4\x16\x3c\x66\x2b\x81\x20\xd8\x8e\x1c\xe7\xbd\xe3\x9d\xce\x25\xec\x0c\x77\x5c\xa6\xd7\x60\x0b\xaf\x47\xbd\x86\x77\xf6\xe6\x2a\xc5\xe3\xb6\x01\xa0\x24\x30\x09\x57\xe3\x05\x4c\x17\x57\xf0\xf7\xf1\x62\xba\xb8\x8e\x7a\xf0\xfb\x74\xf9\x8f\xfb\xaf\x4b\xf8\x7d\x3c\x9f\x8f\x67\xcb\xe9\xcd\x02\xee\xe7\x30\xb9\x9f\x7d\x9a\x2e\xa7\xf7\xb3\x05\xdc\xdf\xc2\x78\xf6\x07\x7c\x9e\xce\x3e\x5d\x03\x72\xb7\x41\x03\xf8\xa4\x0d\xc9\xaf\x0c\x70\x32\x24\x26\xe4\xd3\x32\x80\x4a\x01\x28\x3e\xe8\xb7\xd5\x18\xf3\x35\x8f\x41\x30\x99\xe6\x2c\x45\x48\xd5\x16\x8d\xa4\xf0\xd0\x68\x32\x6e\xc9\x9d\x16\x98\x4c\xa2\x1e\x08\x9e\x71\xe7\xa3\xc8\x1e\x2b\x45\x6c\xbe\x65\x6e\x45\x4c\xf3\x22\x9c\x46\xc0\x34\xc7\x27\x87\xd2\x4b\x33\x78\xfc\xab\x1d\x70\x35\xdc\x7e\x5c\xa1\x63\x1f\xa3\x47\x2e\x93\x11\x4c\x72\xeb\x54\x36\x47\xab\x72\x13\xe3\x27\x5c\x73\xe9\xc3\x3f\xca\xd0\xb1\x84\x39\x36\x8a\x00\x24\xcb\x70\x04\x5c\x3a\x4c\x4d\x50\x64\x10\xb3\x0c\x45\x2d\x32\x22\x00\xc1\x56\x28\x2c\xc1\x03\xf9\x7e\x04\x57\x1e\xa8\xff\x78\x15\x91\xc1\xe8\x60\x9f\x5c\x0f\x86\xc8\x99\x89\x12\x79\x26\x0b\xa4\x3e\xfc\x73\x71\x3f\x7b\x60\x6e\x33\x82\x81\x75\xcc\xe5\x76\xa0\x37\xcc\x62\x14\x42\x32\x41\x1b\x1b\xae\x9d\xd7\x8d\xf2\xad\x26\x11\xd4\x01\x83\xbc\x0f\xb5\x37\xee\x59\xe3\x08\x28\x76\x64\xda\xc9\xeb\x91\xbb\x73\x38\xed\xc1\x02\x9f\xcf\xd5\xef\xb3\xb8\x18\xf4\x69\x61\xbb\x58\xc9\x3c\x5b\x51\xad\x5b\x83\x56\x89\x6d\x70\x9a\x37\x51\x03\x3b\x2f\x1a\x9a\x08\x20\x35\x2a\xd7\x23\x68\x71\x0d\xa1\x17\x46\x0e\x6e\x9f\xee\xf5\xf1\x6f\x05\xb7\xee\xf3\xe1\xc9\x1d\xb7\x41\x33\x2d\x72\xc3\x44\x33\x02\xfc\x81\xdd\x28\xe3\x66\x7b\xe2\xa4\x71\x61\x0d\xcb\x65\x9a\x0b\x66\x1a\x58\x11\x80\x8d\x15\x49\xed\x91\x34\x8b\x31\xa1\x77\xf9\xca\x14\x11\x58\x10\xb2\x31\x13\x58\xd2\xf4\x81\xb5\x40\x81\xb1\x53\xa6\x69\x4c\x5b\xbc\x2d\x20\x29\xce\x4a\x23\x95\x80\x1a\xe3\x43\x9b\x07\xe4\x43\xc0\x16\xf7\x84\x77\x23\xf8\xef\xff\x22\x80\x2d\x13\x3c\x34\xa5\x20\x98\xd2\x28\xc7\x0f\xd3\xdf\x7e\x5d\xc4\x1b\xcc\xd8\xa8\xcd\xa1\x35\x6b\x52\xf9\xa2\xc4\x0f\xd0\x55\x2d\xa9\xdb\x14\xc6\x0f\xd3\x82\x8a\x36\x4a\xa3\x71\x7c\x6f\x59\x4a\xaa\x2a\xb5\xab\x77\x07\xfc\x3e\x90\x40\x45\x37\x49\x28\x99\x31\x30\xdd\x86\x77\x98\x80\x0d\xec\x7d\xe5\xe7\x54\xb0\xa9\xf0\xa1\x74\xfb\x58\x28\x1f\xb5\xa6\xfa\xaa\x56\xff\xc2\xd8\x0d\x60\x81\x86\x88\x90\xcb\x73\x91\x50\xf3\xdd\xa2\x71\x60\x30\x56\xa9\xe4\xff\xa9\x28\xdb\xb2\xa7\x0b\xe6\xd0\xba\x06\x45\x9f\xf2\xd4\x59\xb7\x4c\xe4\x78\x4d\xf5\xd1\x37\x25\x83\xc4\x03\x72\x59\xa3\xe6\x41\xec\x00\xbe\x28\x83\xbe\x13\x8f\x7c\x4b\xb2\xa3\xe1\x30\xe5\xae\x2c\x66\xb1\xca\xb2\x5c\x72\xf7\x3c\xac\x4d\x03\x76\x98\xe0\x16\xc5\xd0\xf2\xb4\xcf\x4c\xbc\xe1\x0e\x63\x97\x1b\x1c\x32\xcd\xfb\x5e\x70\x19\x8a\x58\x96\xf4\xaa\xb8\xfb\x50\x93\xf4\x28\x8f\xab\xc4\xe9\xb4\x3b\x25\x0f\x79\x98\x15\x68\x41\xfe\xbd\x79\xe9\x15\x59\x65\x7e\xb3\x58\x42\xc9\xd4\xbb\xa0\x69\x73\x6f\xed\x3d\x9a\xdd\x1b\x9e\x0c\xc5\xe5\xda\xb7\x0f\xea\xff\x46\x65\x9e\x22\xca\x44\x2b\x2e\x9d\xff\x11\x0b\x8e\xb2\x69\x74\x9b\xaf\x32\xee\x42\x6b\x46\xeb\xc8\x3f\x03\x98\x30\x49\xd3\xc4\x0a\x21\xd7\x09\x73\x98\x0c\x60\x2a\x61\x42\x95\x63\xc2\x68\x60\xf8\xce\x66\x27\x0b\xdb\x3e\x99\xf4\x65\xc3\xd7\x3b\x51\x13\x30\x58\xab\x7a\x5d\x76\x99\x56\x0f\xd5\x32\x71\xa1\x31\x6e\x64\x47\x82\xd6\x0f\x2d\x94\xee\x48\x71\x7f\x58\x1e\xbb\x73\x92\x9e\x58\xc9\x35\x4f\x73\x53\xab\x0d\xb5\x98\x77\x98\xd9\xc3\x97\x07\xb2\x4d\xea\x04\xbc\x74\xfd\xfe\x11\x46\x17\xf7\x9a\x41\x5a\xde\x77\xd8\x74\xff\xf8\x38\xbd\x00\xb3\x9c\xf4\xda\x50\xfb\x1e\xb5\xf5\xc0\xb3\x3b\x3a\x69\x75\x67\xfd\x88\x19\xc3\x9e\x1b\x27\x09\x6a\x94\x09\xca\xb8\xc5\x20\x1d\x36\x3f\xa1\x4f\x17\x97\xb5\x50\xbb\xd7\x91\x7f\x95\x12\x8f\xdc\x1d\xd2\xe9\x14\x52\x1b\x45\x33\xff\x21\x7c\x73\x7e\x30\x8c\xbb\x87\x00\x58\x2b\x22\xbe\xbd\x5b\x5f\xf3\x09\x80\x82\x9e\x39\xa0\x8b\x16\x4a\x9a\xcf\x93\x23\x5d\x8e\x26\x5d\x2e\xad\x63\x42\xf8\x08\x1d\xf2\xd6\xf4\x38\x29\x7d\xd9\x56\x0f\xc5\x0f\x37\x2c\x3f\x24\xfc\xfa\x4b\x2b\xb1\xfd\x7c\xd3\xa0\xa6\x2c\x77\xca\x7c\x57\xe7\x1f\xcc\x24\x2f\xb2\x68\xb8\xa2\x1c\xa9\x2f\x4b\x67\xba\xce\xd1\x85\xa4\xa5\xa0\xd4\x65\x5e\x29\x25\x90\x1d\x3a\x21\x10\x90\x0e\xe5\x51\x74\xbd\x68\x8b\x1a\xee\x67\x7c\x7e\x0b\xfa\x1c\xd7\x17\xa1\x67\x2a\x97\xce\xcf\x64\x97\x60\xfb\x41\xf9\x12\xc4\xee\x02\xda\xea\xd6\xe5\xb3\xc6\x36\xb7\xbe\xc8\xe9\x82\x2a\x61\xd1\x6c\x79\x8c\xe3\x38\x26\xd3\xcc\x5a\x34\xec\xe4\xf8\x86\x00\x5e\xbc\x87\xef\x25\xe8\x7e\xc6\x8d\x51\xd3\x40\x74\x46\x3c\x4d\x6b\xe0\xbe\x22\x2b\x5d\x6e\x9f\x12\x9a\x97\xd6\x9c\x66\x3f\x2a\xc5\xca\xa4\xe5\xa5\x2e\xdc\xf0\x1e\x07\x73\x95\x3b\xb4\x77\x8a\x25\x07\xf5\x71\xff\xe4\x7e\x15\xa5\x40\x1b\x1c\x6a\x65\x1d\x39\x2e\x46\x6b\xcb\xc8\x68\x45\xeb\x08\x8f\xb3\xf4\xef\x0e\xe3\xf0\x94\x2b\x93\x33\x6c\x73\x57\x6e\x57\x2e\xc9\x33\x00\xe1\xed\x72\x0e\x1f\x0f\xe8\xa7\x77\x59\xb7\x7f\xb9\x1e\xbb\xcc\xf2\xbe\xc7\xee\xb8\x10\x21\x24\xb4\x41\x17\x26\xf7\x62\xf6\x67\x0e\x4c\x2e\x1d\xcf\xda\x06\xa5\xef\x55\xe7\x2e\xa8\x3e\x61\x64\x38\xe4\x55\xdf\xe4\x74\x57\x82\x86\x99\xc7\x61\x3c\xf1\x15\x85\x92\x8c\x71\x19\x22\xbb\x31\x3f\xfb\x6b\x67\x60\xfa\xea\xa2\x73\x62\x0c\x7f\x8d\xd4\x67\xd8\xf1\x05\x5b\x9e\x61\xe8\xa3\xa3\xf6\x2b\x4d\x58\x40\x9c\x73\xa9\xf1\x90\x8d\x6b\x8d\x5a\x51\xe7\x78\xc3\xbd\x86\x69\xb6\xe2\x82\xb7\x59\xe9\xdb\x4d\x59\xb1\x92\xc1\x29\x17\x75\xa9\x9a\x46\x93\x92\x50\x01\xb1\x2a\xcc\x50\x69\xcf\xaa\x89\xae\xc5\x9f\x34\x10\x43\x8c\xc6\xaf\xc7\xfd\x85\x7a\xf0\xca\xf8\x13\xcc\xba\xa5\x61\xd2\x7a\x21\x96\xbc\x2b\x41\x0f\x6a\x9c\x75\x40\x45\xa0\xcc\x84\x42\x05\x57\x11\xc2\x24\xdc\xf5\x95\xc4\x22\x1c\xba\x02\x56\x01\x93\xca\x6d\xd0\x1c\x4b\x0e\xb5\x51\x9b\xee\xfb\xfd\x4b\xeb\x0e\x29\xf9\xd5\xaf\x0c\xce\x54\x70\xe9\x57\x41\x7b\x25\xb9\xad\x69\xb9\x63\xb6\x5a\x40\x7c\x3f\x99\x33\xb4\xf6\xbc\x8e\x33\x86\x4d\x9e\x31\x09\x06\x59\xe2\x3f\x5c\x14\xa8\xc0\x65\xc2\x63\xe6\xb7\x38\x09\x3a\xc6\x85\x05\xb6\x52\xf9\x71\xde\x17\x02\x6d\xb0\xe6\xc1\x76\xd5\x5e\x10\xda\x20\xb3\x5d\x65\xec\xc8\xc0\x01\xb8\xba\xb5\x55\x06\xfe\x60\x0b\xdb\xbf\x4d\x96\xe3\x2a\xd4\x21\x4b\x51\x84\x8a\xbe\x59\x89\x71\x1d\xbe\xdc\xad\x61\x69\x72\xbc\x86\x5b\x26\x2c\x5e\xc3\x57\xf9\x28\xd5\xee\x32\x89\xce\x9c\xd6\xfd\x94\xae\xd6\x8d\xf5\x7d\x25\xd5\x05\x8c\x4f\x2f\x3d\x3a\xb3\xb3\x63\x1f\x72\x41\x33\x7e\x5f\x35\x1d\x3c\x3f\xce\xaa\x29\xe1\x29\xda\xf3\xd7\x41\x6b\xc6\x45\x6e\x4e\xaf\x83\x6e\x03\xcc\xb1\x8b\x4f\x39\xb8\xbb\xf0\xbc\xe0\xa4\x58\x6d\xd1\xb4\xde\xb9\xda\x84\x9a\x17\xf0\xed\xc3\xfd\xe9\x08\xa4\x6e\xed\x30\xd3\x1d\xf7\xc3\x53\x9b\xa3\x03\x02\x5f\xd8\xd3\x9b\x69\x74\x37\xc2\x73\xfb\xd7\x19\xcd\xa0\x3b\x03\x28\xd4\x0b\x49\x4e\x9f\x7e\x61\x4f\x9d\x4e\xed\x9a\x62\x3b\x54\x3b\x47\xad\x13\x2a\x75\xab\xd3\x2f\xc2\xaf\xf5\x20\x04\x4c\xcb\x51\x8b\x04\x9d\x6a\xa5\x28\xd1\xd0\xc0\x31\x7f\xdf\xee\xfd\x09\xeb\x91\xf7\xed\xde\x61\xdd\xaf\x02\x72\xf1\xbe\xab\xbb\x10\xfd\x7d\x57\xf7\xb6\x1d\xc6\xfb\xae\xee\x07\xd9\xd5\xf1\xac\xc5\x5b\x9d\x4c\x5e\xf5\xf5\x71\xc3\xec\xe9\x61\xb3\xb6\x89\xf1\xff\xbc\x3a\x8e\x84\x6e\xe2\x82\x39\x1a\x29\xde\xbf\x85\x5e\xf2\x2d\x34\x04\xe6\x83\x51\x5b\xde\x92\x43\xcd\xfe\xd6\x84\x7d\x85\x8b\x0a\x2e\x2d\xff\x3f\x3a\x89\x56\xfe\x3f\xeb\x6c\x84\xed\xab\x18\xb4\xa4\xc8\xc1\xab\x92\x1e\x6c\x3f\xee\x7f\x55\xff\x37\x0c\x7f\xab\xf3\x47\x50\x7c\x68\xc3\x64\x04\xce\x54\x17\x47\xeb\x94\xa1\x9c\x0a\xef\xfe\x1f\x00\x00\xff\xff\xb8\x5c\x23\x74\x08\x2d\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1a\x4d\x73\xe2\x38\xf6\xee\x5f\xf1\x2a\x1c\x7a\xa6\x2a\xc0\xf6\xcc\x65\x8b\x3d\xb1\x74\x52\xcb\x76\x9a\xa4\x80\x9e\xa9\x39\x0a\xfb\x61\xb4\x91\x25\xad\x24\x43\xb2\x5b\xfb\xdf\xb7\x9e\x64\x1b\x1b\x6c\x42\x48\x77\x4d\x55\x57\x7c\xc3\x7a\xdf\xdf\x7a\xa6\x07\xfd\x6f\xf7\x44\x3d\xb8\xe3\x31\x4a\x8b\x09\x38\x05\x6e\x83\x30\xd6\x2c\xde\x20\x2c\xd4\xda\xed\x98\x41\xb8\x55\xb9\x4c\x98\xe3\x4a\xc2\x4f\xe3\xc5\xed\xcf\x90\xcb\x04\x0d\x28\x89\xa0\x0c\x64\xca\x60\xd4\x83\x58\x49\x67\xf8\x2a\x77\xca\x80\x08\x04\x81\xa5\x06\x31\x43\xe9\xec\x00\x60\x81\xe8\xa9\xcf\xee\x97\xd3\xc9\x0d\xac\xb9\x40\x48\xb8\x0d\x48\x98\xc0\x8e\xbb\x4d\xd4\x03\xb7\xe1\x16\x76\xca\x3c\xc2\x5a\x19\x60\x49\xc2\x89\x31\x13\xc0\xe5\x5a\x99\x2c\x88\x61\x30\x65\x26\xe1\x32\x85\x58\xe9\x67\xc3\xd3\x8d\x03\xb5\x93\x68\xec\x86\xeb\x41\xd4\x83\x25\xa9\xb1\xb8\x2d\x25\xb1\x81\xac\xe7\xe9\x14\xfc\xa1\xf2\x42\x87\x9a\xba\x85\x15\xae\xe1\x37\x34\x96\x98\xfc\x32\xf8\x4b\xd4\x83\x9f\x08\xe4\xaa\x38\xbc\xfa\xf9\x6f\xf0\xac\x72\xc8\xd8\x33\x48\xe5\x20\xb7\x58\xa3\x8c\x4f\x31\x6a\x07\x5c\x42\xac\x32\x2d\x38\x93\x31\xee\xd5\xaa\x38\x0c\xc0\x0b\x40\x34\xd4\xca\x31\x2e\x81\x79\x35\x40\xad\xeb\x60\xc0\x5c\xd4\x8b\x7a\xe0\x9f\x8d\x73\x7a\x34\x1c\xee\x76\xbb\x01\xf3\xe2\x0e\x94\x49\x87\xa5\x76\xc3\xbb\xe9\xe4\x66\xb6\xb8\xe9\x7b\x91\xa3\x1e\x7c\x95\x02\xad\x05\x83\xff\xce\xb9\xc1\x04\x56\xcf\xc0\xb4\x16\x3c\x66\x2b\x81\x20\xd8\x8e\x1c\xe7\xbd\xe3\x9d\xce\x25\xec\x0c\x77\x5c\xa6\xd7\x60\x0b\xaf\x47\xbd\x86\x77\xf6\xe6\x2a\xc5\xe3\xb6\x01\xa0\x24\x30\x09\x57\xe3\x05\x4c\x17\x57\xf0\xf7\xf1\x62\xba\xb8\x8e\x7a\xf0\xfb\x74\xf9\x8f\xfb\xaf\x4b\xf8\x7d\x3c\x9f\x8f\x67\xcb\xe9\xcd\x02\xee\xe7\x30\xb9\x9f\x7d\x9a\x2e\xa7\xf7\xb3\x05\xdc\xdf\xc2\x78\xf6\x07\x7c\x9e\xce\x3e\x5d\x03\x72\xb7\x41\x03\xf8\xa4\x0d\xc9\xaf\x0c\x70\x32\x24\x26\xe4\xd3\x32\x80\x4a\x01\x28\x3e\xe8\xb7\xd5\x18\xf3\x35\x8f\x41\x30\x99\xe6\x2c\x45\x48\xd5\x16\x8d\xa4\xf0\xd0\x68\x32\x6e\xc9\x9d\x16\x98\x4c\xa2\x1e\x08\x9e\x71\xe7\xa3\xc8\x1e\x2b\x45\x6c\xbe\x65\x6e\x45\x4c\xf3\x22\x9c\x46\xc0\x34\xc7\x27\x87\xd2\x4b\x33\x78\xfc\xab\x1d\x70\x35\xdc\x7e\x5c\xa1\x63\x1f\xa3\x47\x2e\x93\x11\x4c\x72\xeb\x54\x36\x47\xab\x72\x13\xe3\x27\x5c\x73\xe9\xc3\x3f\xca\xd0\xb1\x84\x39\x36\x8a\x00\x24\xcb\x70\x04\x5c\x3a\x4c\x4d\x50\x64\x10\xb3\x0c\x45\x2d\x32\x22\x00\xc1\x56\x28\x2c\xc1\x03\xf9\x7e\x04\x57\x1e\xa8\xff\x78\x15\x91\xc1\xe8\x60\x9f\x5c\x0f\x86\xc8\x99\x89\x12\x79\x26\x0b\xa4\x3e\xfc\x73\x71\x3f\x7b\x60\x6e\x33\x82\x81\x75\xcc\xe5\x76\xa0\x37\xcc\x62\x14\x42\x32\x41\x1b\x1b\xae\x9d\xd7\x8d\xf2\xad\x26\x11\xd4\x01\x83\xbc\x0f\xb5\x37\xee\x59\xe3\x08\x28\x76\x64\xda\xc9\xeb\x91\xbb\x73\x38\xed\xc1\x02\x9f\xcf\xd5\xef\xb3\xb8\x18\xf4\x69\x61\xbb\x58\xc9\x3c\x5b\x51\xad\x5b\x83\x56\x89\x6d\x70\x9a\x37\x51\x03\x3b\x2f\x1a\x9a\x08\x20\x35\x2a\xd7\x23\x68\x71\x0d\xa1\x17\x46\x0e\x6e\x9f\xee\xf5\xf1\x6f\x05\xb7\xee\xf3\xe1\xc9\x1d\xb7\x41\x33\x2d\x72\xc3\x44\x33\x02\xfc\x81\xdd\x28\xe3\x66\x7b\xe2\xa4\x71\x61\x0d\xcb\x65\x9a\x0b\x66\x1a\x58\x11\x80\x8d\x15\x49\xed\x91\x34\x8b\x31\xa1\x77\xf9\xca\x14\x11\x58\x10\xb2\x31\x13\x58\xd2\xf4\x81\xb5\x40\x81\xb1\x53\xa6\x69\x4c\x5b\xbc\x2d\x20\x29\xce\x4a\x23\x95\x80\x1a\xe3\x43\x9b\x07\xe4\x43\xc0\x16\xf7\x84\x77\x23\xf8\xef\xff\x22\x80\x2d\x13\x3c\x34\xa5\x20\x98\xd2\x28\xc7\x0f\xd3\xdf\x7e\x5d\xc4\x1b\xcc\xd8\xa8\xcd\xa1\x35\x6b\x52\xf9\xa2\xc4\x0f\xd0\x55\x2d\xa9\xdb\x14\xc6\x0f\xd3\x82\x8a\x36\x4a\xa3\x71\x7c\x6f\x59\x4a\xaa\x2a\xb5\xab\x77\x07\xfc\x3e\x90\x40\x45\x37\x49\x28\x99\x31\x30\xdd\x86\x77\x98\x80\x0d\xec\x7d\xe5\xe7\x54\xb0\xa9\xf0\xa1\x74\xfb\x58\x28\x1f\xb5\xa6\xfa\xaa\x56\xff\xc2\xd8\x0d\x60\x81\x86\x88\x90\xcb\x73\x91\x50\xf3\xdd\xa2\x71\x60\x30\x56\xa9\xe4\xff\xa9\x28\xdb\xb2\xa7\x0b\xe6\xd0\xba\x06\x45\x9f\xf2\xd4\x59\xb7\x4c\xe4\x78\x4d\xf5\xd1\x37\x25\x83\xc4\x03\x72\x59\xa3\xe6\x41\xec\x00\xbe\x28\x83\xbe\x13\x8f\x7c\x4b\xb2\xa3\xe1\x30\xe5\xae\x2c\x66\xb1\xca\xb2\x5c\x72\xf7\x3c\xac\x4d\x03\x76\x98\xe0\x16\xc5\xd0\xf2\xb4\xcf\x4c\xbc\xe1\x0e\x63\x97\x1b\x1c\x32\xcd\xfb\x5e\x70\x19\x8a\x58\x96\xf4\xaa\xb8\xfb\x50\x93\xf4\x28\x8f\xab\xc4\xe9\xb4\x3b\x25\x0f\x79\x98\x15\x68\x41\xfe\xbd\x79\xe9\x15\x59\x65\x7e\xb3\x58\x42\xc9\xd4\xbb\xa0\x69\x73\x6f\xed\x3d\x9a\xdd\x1b\x9e\x0c\xc5\xe5\xda\xb7\x0f\xea\xff\x46\x65\x9e\x22\xca\x44\x2b\x2e\x9d\xff\x11\x0b\x8e\xb2\x69\x74\x9b\xaf\x32\xee\x42\x6b\x46\xeb\xc8\x3f\x03\x98\x30\x49\xd3\xc4\x0a\x21\xd7\x09\x73\x98\x0c\x60\x2a\x61\x42\x95\x63\xc2\x68\x60\xf8\xce\x66\x27\x0b\xdb\x3e\x99\xf4\x65\xc3\xd7\x3b\x51\x13\x30\x58\xab\x7a\x5d\x76\x99\x56\x0f\xd5\x32\x71\xa1\x31\x6e\x64\x47\x82\xd6\x0f\x2d\x94\xee\x48\x71\x7f\x58\x1e\xbb\x73\x92\x9e\x58\xc9\x35\x4f\x73\x53\xab\x0d\xb5\x98\x77\x98\xd9\xc3\x97\x07\xb2\x4d\xea\x04\xbc\x74\xfd\xfe\x11\x46\x17\xf7\x9a\x41\x5a\xde\x77\xd8\x74\xff\xf8\x38\xbd\x00\xb3\x9c\xf4\xda\x50\xfb\x1e\xb5\xf5\xc0\xb3\x3b\x3a\x69\x75\x67\xfd\x88\x19\xc3\x9e\x1b\x27\x09\x6a\x94\x09\xca\xb8\xc5\x20\x1d\x36\x3f\xa1\x4f\x17\x97\xb5\x50\xbb\xd7\x91\x7f\x95\x12\x8f\xdc\x1d\xd2\xe9\x14\x52\x1b\x45\x33\xff\x21\x7c\x73\x7e\x30\x8c\xbb\x87\x00\x58\x2b\x22\xbe\xbd\x5b\x5f\xf3\x09\x80\x82\x9e\x39\xa0\x8b\x16\x4a\x9a\xcf\x93\x23\x5d\x8e\x26\x5d\x2e\xad\x63\x42\xf8\x08\x1d\xf2\xd6\xf4\x38\x29\x7d\xd9\x56\x0f\xc5\x0f\x37\x2c\x3f\x24\xfc\xfa\x4b\x2b\xb1\xfd\x7c\xd3\xa0\xa6\x2c\x77\xca\x7c\x57\xe7\x1f\xcc\x24\x2f\xb2\x68\xb8\xa2\x1c\xa9\x2f\x4b\x67\xba\xce\xd1\x85\xa4\xa5\xa0\xd4\x65\x5e\x29\x25\x90\x1d\x3a\x21\x10\x90\x0e\xe5\x51\x74\xbd\x68\x8b\x1a\xee\x67\x7c\x7e\x0b\xfa\x1c\xd7\x17\xa1\x67\x2a\x97\xce\xcf\x64\x97\x60\xfb\x41\xf9\x12\xc4\xee\x02\xda\xea\xd6\xe5\xb3\xc6\x36\xb7\xbe\xc8\xe9\x82\x2a\x61\xd1\x6c\x79\x8c\xe3\x38\x26\xd3\xcc\x5a\x34\xec\xe4\xf8\x86\x00\x5e\xbc\x87\xef\x25\xe8\x7e\xc6\x8d\x51\xd3\x40\x74\x46\x3c\x4d\x6b\xe0\xbe\x22\x2b\x5d\x6e\x9f\x12\x9a\x97\xd6\x9c\x66\x3f\x2a\xc5\xca\xa4\xe5\xa5\x2e\xdc\xf0\x1e\x07\x73\x95\x3b\xb4\x77\x8a\x25\x07\xf5\x71\xff\xe4\x7e\x15\xa5\x40\x1b\x1c\x6a\x65\x1d\x39\x2e\x46\x6b\xcb\xc8\x68\x45\xeb\x08\x8f\xb3\xf4\xef\x0e\xe3\xf0\x94\x2b\x93\x33\x6c\x73\x57\x6e\x57\x2e\xc9\x33\x00\xe1\xed\x72\x0e\x1f\x0f\xe8\xa7\x77\x59\xb7\x7f\xb9\x1e\xbb\xcc\xf2\xbe\xc7\xee\xb8\x10\x21\x24\xb4\x41\x17\x26\xf7\x62\xf6\x67\x0e\x4c\x2e\x1d\xcf\xda\x06\xa5\xef\x55\xe7\x2e\xa8\x3e\x61\x64\x38\xe4\x55\xdf\xe4\x74\x57\x82\x86\x99\xc7\x61\x3c\xf1\x15\x85\x92\x8c\x71\x19\x22\xbb\x31\x3f\xfb\x6b\x67\x60\xfa\xea\xa2\x73\x62\x0c\x7f\x51\xfd\x97\x26\xda\x06\xf5\xd7\xdb\xf5\xe8\xa8\xfd\x06\x13\xf6\x0d\xe7\xdc\x61\x3c\x64\xe3\x16\xa3\x56\xd4\x28\xde\x70\x8d\x61\x9a\xad\xb8\xe0\x6d\xf6\xfd\x76\x43\x55\xac\x64\x88\x9c\x8b\x9a\x52\x4d\xa3\x49\x49\xa8\x80\x58\x15\x66\xa8\xb4\x67\xd5\x00\xd7\xe2\x50\x9a\x7f\x21\x46\xe3\xb7\xe1\xfe\xfe\x3c\x78\x65\xb8\x09\x66\xdd\xd2\x30\x69\xbd\x10\x4b\xde\x95\x8f\x07\x25\xcd\x3a\xa0\x9c\x2f\x03\xbf\x50\xc1\x55\x84\x30\x09\x57\x7b\x25\xb1\x08\x87\xae\xfa\xa2\x80\x49\xe5\x36\x68\x8e\x25\x87\xda\x64\x4d\xd7\xfb\xfe\xa5\x65\x86\x94\xfc\xea\x37\x04\x67\x2a\xb8\xf4\x9b\x9f\xbd\x92\xdc\xd6\xb4\xdc\x31\x5b\xed\x1b\xbe\x9f\xcc\x19\x5a\x7b\x5e\x83\x19\xc3\x26\xcf\x98\x04\x83\x2c\xf1\xdf\x29\x0a\x54\xe0\x32\xe1\x31\xf3\x4b\x9b\x04\x1d\xe3\xc2\x02\x5b\xa9\xfc\xb8\x66\x14\x02\x6d\xb0\xe6\xc1\x76\xd5\x5e\x10\xda\x20\xb3\x5d\x55\xeb\xc8\xc0\x01\xb8\xba\xa4\x55\x06\xfe\x60\x0b\xdb\xbf\x4d\x96\xe3\x2a\xd4\x21\x4b\x51\x84\x8a\x36\x59\x89\x71\x1d\x3e\xd4\xad\x61\x69\x72\xbc\x86\x5b\x26\x2c\x5e\xc3\x57\xf9\x28\xd5\xee\x32\x89\xce\x1c\xce\xfd\x50\xae\xd6\x8d\x6d\x7d\x25\xd5\x05\x8c\x4f\x77\x84\xce\xec\xec\x58\x7f\x5c\xd0\x7b\xdf\x37\x4b\x07\xcf\x8f\xb3\x59\x4a\x78\x8a\xf6\xfc\xed\xcf\x9a\x71\x91\x9b\xd3\xdb\x9f\xdb\x00\x73\xec\xe2\x53\x0e\xee\x2e\x3c\x2f\x38\x29\x56\x5b\x34\xad\x57\xac\x36\xa1\xe6\x05\x7c\xfb\x2c\x7f\x3a\x02\xa9\x5b\x3b\xcc\x74\xc7\x75\xf0\xd4\xa2\xe8\x80\xc0\x17\xf6\xf4\x66\x1a\xdd\x8d\xf0\xdc\xfe\x75\x46\x33\xe8\xce\x00\x0a\xf5\x42\x92\xd3\xa7\x5f\xd8\x53\xa7\x53\x3b\x26\x60\xd7\xa1\xda\x39\x6a\x9d\x50\xa9\x5b\x9d\x7e\x11\x7e\xad\x07\x21\x60\x5a\x8e\x5a\x24\xe8\x54\x2b\x45\x89\x86\x06\x8e\xf9\xfb\x32\xef\x4f\xd8\x86\xbc\x2f\xf3\x0e\xeb\x7e\x15\x90\x8b\xf7\xd5\xdc\x85\xe8\xef\xab\xb9\xcb\xda\xca\xfb\x6a\xae\x94\xee\x07\x59\xcd\xf1\xac\xc5\x5b\x9d\x4c\x5e\xf5\xb1\x71\xc3\xec\xe9\x61\xb3\xb6\x89\xf1\x7f\xb4\x3a\x8e\x84\x6e\xe2\x82\x39\x1a\x29\xde\x3f\x7d\x5e\xf2\xe9\x33\x04\xe6\x83\x51\x5b\xde\x92\x43\xcd\xfe\xd6\x84\x7d\x85\x8b\x0a\x2e\x2d\x7f\x37\x3a\x89\x56\xfe\x1d\xeb\x6c\x84\xed\xab\x18\xb4\xa4\xc8\xc1\xab\x92\x1e\x6c\x3f\xee\x7f\x55\x7f\x2f\x0c\xff\xa2\xf3\x47\x50\x7c\x57\xc3\x64\x04\xce\x54\x17\x47\xeb\x94\xa1\x9c\x0a\xef\xfe\x1f\x00\x00\xff\xff\xdc\x02\x4c\x1d\xf7\x2c\x00\x00"), }, "/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-deployment.yaml", @@ -354,9 +354,9 @@ var assets = func() http.FileSystem { "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 33234, + uncompressedSize: 33008, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x6e\x24\x37\xf2\xd8\xff\xfb\x14\x84\x12\x40\x1f\x98\x69\xed\xfa\xe0\xb3\x4f\x89\x73\x50\xd6\xbe\x3b\xd9\xde\xb5\xb2\xbb\x77\x97\xe0\x72\xb8\xe1\x74\xd7\xcc\xd0\xea\x26\xfb\x47\xb2\x47\x3b\x0e\x02\xe4\x35\xf2\x7a\x79\x92\xa0\xaa\x48\x36\xbb\xa7\x25\x8d\xd6\x96\x61\x01\x3f\xec\x1f\xab\x91\xba\x8b\xc5\x62\x7d\x7f\x70\xbc\x95\xca\xbb\x8b\x17\x73\xa1\x65\x03\x17\x42\xae\x56\x4a\x2b\xbf\x7b\x21\x44\x5b\x4b\xbf\x32\xb6\xb9\x10\x2b\x59\x3b\xc0\xdf\x58\xb3\x52\x35\xb8\x8b\x17\x42\xcc\xc5\x77\xdd\x12\xac\x06\x0f\x8e\x3f\x6a\xe9\xd5\x16\xe8\xe7\x1f\x5a\xd0\xef\x37\x6a\xe5\x5f\x08\x51\x81\x2b\xad\x6a\xbd\x32\xfa\x42\x5c\xd6\xb5\xb9\x75\xc2\x1b\x51\x1a\xed\x70\x71\x2d\x6e\x37\xaa\xdc\x08\x6d\x2a\x70\xc2\x6f\x40\x28\xed\x61\x6d\x25\xbe\x20\x5a\x53\x9d\xb8\x53\x21\x2d\x08\xa8\xd5\x5a\x2d\x6b\x5c\x40\x20\x80\x25\x08\x57\x6e\xa0\xea\x6a\xa8\x84\xd1\x33\xb1\x94\x8e\x7e\x12\xb5\x5c\x42\xed\xf0\x27\x04\x87\x80\x67\xc6\x8a\x5b\xe5\x37\x04\xdb\xce\x5b\x53\xa5\x8d\x0a\xa9\x2b\x02\x29\xb5\x57\xf3\xf8\xdb\x49\x68\xad\xa9\x10\x43\xe9\x09\x1f\x59\x5b\x90\xd5\x4e\xd8\x4e\x6b\xa5\xd7\xf9\x72\xae\xb8\xf2\xff\xef\xff\xfc\x5f\x47\x70\x2b\xe5\xe4\x12\x71\x5c\xee\x44\x05\x2b\xd9\xd5\xbe\x60\x5a\xb6\x60\xbd\x8a\xd4\x64\xf2\x83\xa6\x67\x79\x8f\xbb\x16\x2e\xc4\xd2\x98\x9a\xe1\xe4\x74\x7c\x2d\x35\x12\xa0\x43\x1c\xbd\x09\xaf\x09\x63\xe3\x6a\x42\x0a\x3a\xd9\x02\x29\xce\x3f\x3a\xe1\x36\x88\xb7\xdf\x28\x27\x4a\xd3\x34\x46\x13\xdc\x84\xca\xae\xc8\x10\x69\x4d\x35\xcf\x78\xe1\x7e\x6c\x2e\xeb\x5b\xb9\x43\xa0\xf3\xda\x94\xd2\x83\x13\x4d\x57\x7b\xd5\xd6\x20\x2c\xb4\xb5\x2a\xa5\x13\x66\xb5\x77\xb8\x8a\x29\xe6\x64\x03\x01\x13\x24\x9e\x38\x09\x54\x12\x67\xc4\x77\x67\xa7\x7b\x78\xe5\x27\xf5\x20\x72\x6f\x61\x0b\xf6\x57\xc1\x0d\x9f\x48\x78\xcd\x99\x6f\x32\xf4\x9c\xb7\x4a\xaf\xf7\x11\xfc\x1a\x56\x4a\x83\x13\x52\x38\xf0\x88\xcb\xc1\xa2\xc0\x62\x10\xf0\x3b\x58\x18\xee\x3a\xe6\x9f\x81\x31\x49\xc6\x09\x82\xac\x77\xc2\x6f\x8c\x03\xd1\x48\x5f\x6e\x50\x2e\x70\x59\x82\x2c\x1c\xd4\x50\x7a\x63\x67\x01\x63\x0b\x35\xa9\x0c\xdc\x06\x3e\xb5\x56\x5b\xd0\x84\x98\x6b\x65\x09\xa7\x2c\x6b\x7e\x03\x13\x64\x70\x1b\xd3\xd5\x15\xca\x40\x3a\xd9\x2a\x80\x45\x41\xbf\x97\x65\x9e\xe3\x46\xb5\xf1\xf7\x6c\x36\x6e\x75\xd9\xa9\xba\x02\x3b\x50\xde\xde\x76\xbf\x8c\xee\xfe\xb0\x81\xb8\x00\x6b\x14\xa1\x1c\x2b\x54\x2d\xeb\x7a\x97\x94\x51\x05\x1e\x6c\xa3\x34\xd0\x5e\x97\xe0\x3c\xd2\x57\x7a\x58\x07\x61\x35\x04\x05\x15\x2f\x5a\x81\x95\x5a\x77\x16\xc4\x55\xbf\xf5\xef\x94\x77\xcf\x40\x45\x6e\xc1\x2e\x8d\x83\x07\x11\xf9\x86\x57\x0e\x8f\x8b\xda\xac\xd7\xc1\x5e\x30\x1d\x4a\xd3\xb4\x46\x83\xf6\xc1\xb8\xb8\xae\x6d\x8d\xf5\x42\x79\x71\x02\xc5\xba\x08\x28\x7c\x27\xb5\xba\x31\xe1\x9d\xd6\x54\xa7\xfd\xb1\x97\xc8\x8f\x4f\x77\xe8\xaf\x11\x7c\x38\xf2\x72\x48\xd5\xfe\xfc\xb6\x60\x9d\x32\x9a\x94\xe9\x65\x2b\xcb\xf4\xde\x77\x84\xbf\xed\xb4\x57\x0d\xd0\xa1\x93\x38\x40\x25\x6a\xb5\xb4\xd2\x2a\x70\x33\xc1\x90\x03\x93\x47\x8b\xf9\x0c\x78\x20\x6c\x6b\x1e\x76\x7f\x80\x4a\x41\x82\xd2\x79\xcd\x6f\xe6\x91\x28\xe1\x6d\x44\xb1\x73\x20\x56\xc6\x8e\xb5\x7f\x21\xae\xbc\x30\x5b\xb0\x56\x55\xe0\x02\x42\xf8\x4c\xb4\x47\x11\x04\xea\xa9\x60\xbb\x32\x89\x12\xd7\x81\x33\x32\x9e\x31\xda\x4b\xa5\x9f\x52\x59\xbc\x8e\x4b\x3c\xc4\x3b\xfd\x21\x47\x53\x9c\x63\x27\xc4\xed\x06\x2c\xec\x19\xc4\x5b\x55\xd7\x78\x00\xc5\x95\x17\xb2\x76\x06\xc1\x6c\x91\x3c\x09\x32\x3f\x87\xe4\x7c\x0f\x76\xab\x4a\xd4\xe4\xce\x99\x52\x25\x05\x1a\x14\x72\x5a\xee\x19\xb0\x9c\xec\xbc\x79\x10\x8b\xa3\xa3\x9c\x49\xe1\xdf\x3a\x70\x7e\x5e\xb6\xdd\x81\x0c\xda\x28\xad\x9a\xae\x11\xb2\x31\x9d\x26\xc3\xf7\xfa\xfa\xaf\x04\x47\x59\x96\xcb\x31\xec\x06\x1a\x63\x77\x9f\x0c\x9e\x5f\x9f\x5c\xa1\x56\x8d\x7a\x14\xee\xf2\xe3\x81\xb8\x33\xe4\xc7\x61\xbe\x07\xfc\x1e\xcc\xe1\x63\x7b\x88\x7d\x98\xe4\x98\xf3\xc8\x2e\x04\x84\x14\xac\x92\xe2\x26\x49\x62\xe4\xe8\xa1\xa3\x63\x7d\xb6\x9a\xd2\x7e\x62\x13\xb9\xdc\x49\x51\xa9\xd5\x0a\x2c\x68\x4f\x2f\x07\x8c\x29\x54\x19\x88\x45\xef\xf7\x2e\xbe\x7c\xf9\xe5\xcb\xc5\xe9\x78\xd9\xb9\x8e\x8e\xf2\x03\x34\xbc\x77\x79\x04\x92\xb4\xdf\xbd\x08\x05\xf9\xe8\xd1\xda\x78\xdf\x0e\xd1\x72\x4c\xa0\xf9\xa3\xa9\xd2\x69\xf4\x70\x38\x2a\x0d\x40\x18\x99\x21\x49\xd8\x46\xbb\x81\x0f\x1e\xd1\xcd\xc9\x75\x37\x56\x9f\x44\xb4\x3b\xb1\x23\xe2\x4d\xa2\x18\xcd\x05\xc5\xcc\xfb\x28\xee\x93\xee\x50\xbc\x48\x20\x94\xce\x56\xc4\x37\xd1\x56\x1d\x3b\xfa\xb1\x12\x8b\x4c\x63\x2f\x46\x21\x70\x62\x20\x6b\x96\xe0\xe6\x87\x6a\xd8\x6b\x7a\x9c\xbd\xaa\x6a\x2c\x2e\x0c\x2b\x86\x3b\x53\x0c\x4c\x81\xdb\xe2\x74\xbc\xfe\xbc\x95\x7e\x73\xc0\xa6\xaf\xa5\xdf\x20\x29\x65\x59\x82\x4b\x0b\x11\x08\x71\x92\xcc\xf1\xe2\x7c\x03\xb2\xf6\x9b\xc5\x69\x21\xde\x1a\x0f\xd1\xc3\x4f\x87\x11\x35\x3b\x72\x10\xba\x3d\xc1\xe9\x83\xca\x68\xf1\x6f\x9d\xb4\x37\x9d\x1b\xf8\x4c\x0e\xbc\x47\xaf\x51\xf9\x60\xf7\xc0\xe1\x3a\x6c\xea\x03\xcc\xdc\x38\xae\xa4\xaa\x29\x28\x31\xc2\x79\x69\xfd\x50\xef\x6d\x41\x83\x73\x73\x8c\x86\x94\xac\xe7\x15\xd4\x72\x37\x94\x91\xdf\x7d\x36\x11\x49\x77\xcd\x12\x2c\x2a\x3d\x07\xa5\xd1\x95\x13\x72\xe5\xc1\x8e\x28\xbd\x91\x8e\x97\x44\xb1\x85\x95\xb1\x90\x16\xec\xf7\x8e\x67\x84\x26\x8f\x31\xf0\x63\xbd\x1c\xf0\xc3\xdd\x9b\xce\x7f\x3a\x66\x2c\x26\xfd\x01\x21\x40\x27\x4c\x87\xd6\xb7\x6d\x6b\x74\x38\xd8\x03\x08\x98\xc5\x95\xf9\xf1\x49\x9c\x5a\xb0\xca\x54\x0f\xa3\xf4\x17\x73\x2b\xcc\xca\x03\x79\x75\x2d\x58\xf4\xaf\x7a\x4c\xc6\xeb\x1f\xb2\xb2\xeb\x88\xe5\xe6\x7e\x63\xc1\x6d\x4c\x7d\x00\x12\x6f\x82\xa1\x2d\x8d\x76\x50\x76\x14\x83\x06\x30\xe0\x7a\x4d\xcb\xb4\x31\x1c\x60\x6a\xa7\x2a\xb0\x50\xc5\x07\x57\x5d\x1d\xa8\xc3\x34\xdd\xc8\x2d\x32\x16\x32\x18\x54\xc5\xe3\xb7\x81\x2f\x76\x16\x7e\xee\x36\x02\x98\x07\x77\xc1\x78\x4e\xed\x80\xf6\x07\xd5\x63\x36\x61\x41\x56\xea\x57\x15\x9d\xb4\xe2\x81\xb2\xd3\x63\xf8\xab\x0b\x4f\x5a\xfa\x3e\xba\x3d\x91\xf8\x1c\xb4\xf6\x73\x10\xa0\x83\x36\xf2\xdb\x17\xa1\xbd\x6d\xa4\xb0\xd3\x52\x70\xf3\x14\xb5\x85\x63\x8a\x39\x2d\x5a\xe4\xc9\x70\xb3\x73\xde\x34\xea\xa7\x98\x96\xc2\x2d\x98\x8e\xf8\x9e\x99\x52\x95\x4c\x46\xd5\x80\x3d\x47\x3c\x43\x12\x35\x33\xab\xae\xf8\xfb\x46\xd5\x20\xb4\xb1\x0d\xe5\xbc\xa4\x1e\x58\xdd\x10\x05\x38\x21\x45\x6b\x70\x55\x82\xb8\x04\x21\x39\x43\xde\xb5\x9c\x00\xe1\x92\xc1\x4c\x38\xd3\x40\x5a\x5d\x78\xe9\x6e\xdc\x0c\x89\xba\x11\xd2\x89\xa5\xf4\xe5\x46\xfc\x68\x96\x6e\x16\xe0\x66\xbe\xa6\x2c\xbd\xda\x52\x16\x45\x7a\xe1\x5a\x28\xd5\x4a\x95\x62\x63\x3a\x9b\x62\xe8\x4a\xee\x44\xac\x7b\xc8\x7e\x15\xd2\x58\x14\xb9\x28\xdd\x79\x70\xc5\x9f\x0c\xbb\xd3\xb4\x6e\xc0\x81\xf4\xd2\x90\x94\x8d\xf4\x60\x95\xac\x23\x05\xf3\x7d\x4b\xdc\x71\x7f\x66\x74\x0a\xdf\x9a\xe5\x0b\xf6\x4a\x9c\x07\x59\xe1\x8a\x12\xb5\x9b\xae\xa4\xad\x44\x05\x6d\x6d\x76\x0d\x68\x3f\x53\x5a\x18\x4b\x49\x45\x23\x9c\xdc\x22\xf3\x38\xd3\x59\x8c\xd6\x6f\x37\xa0\xc7\x8b\x31\x6f\x1b\x60\xbf\x49\x03\x9f\x2e\x79\xb6\xc8\xd8\x50\x15\x59\xe2\x23\xa6\xd4\x50\xa9\x8a\x95\x35\xac\x43\x56\xa6\xae\xcd\x2d\x32\x70\x9f\x7b\x63\xaa\x5a\x10\xb0\x95\x75\x47\x94\x8d\x41\x47\xa2\xc3\x85\x58\x10\x77\x2c\x66\x62\x81\xbf\xc5\xff\xd1\x59\xf3\x3f\x2d\x0a\x64\x3e\xdb\xd5\x41\x9a\x3a\x17\x9d\xc7\x29\xba\x08\x19\xd2\x19\x09\x91\x8b\x79\x04\x7d\xc1\x9b\xe6\xe3\x72\x91\x89\x6f\xad\xf2\x1e\x78\xef\xd2\x31\x4a\xf0\xb1\xb5\xe0\x28\xe9\x56\x88\x6f\x8a\x75\x11\x40\x5c\x78\x55\xde\xfc\x91\x01\x7c\xf5\xfb\x97\x2f\x5f\xbe\x5c\x14\xf3\x3d\x84\x2f\x12\x71\x09\xe8\x08\x62\x4f\xe0\x60\x9d\x92\x6d\x38\x09\xba\xe2\x28\xfc\xe2\x48\xb4\x92\x03\x21\x07\x1e\x4f\xe2\xe5\x29\x67\x2c\x09\x23\x5e\xf6\xc2\xcb\xe5\x1f\x63\x7d\xe2\xab\x97\xe7\x9f\xfd\xc7\xff\xd5\xd6\x9d\xfb\xdf\x67\x53\xff\xfd\x71\x81\x5c\x1b\xd0\xbc\xf0\x56\xad\xd7\x60\xff\x88\x60\xbe\x7a\xc9\x4f\xbc\x3c\xff\xec\xde\xf7\x8b\xe3\xdf\x7e\x16\x27\x52\xe3\xc0\x30\x2b\x32\x4e\x7c\x2d\xa9\xec\xdb\x8d\xa9\xc7\x99\xc2\x55\x56\xe2\x32\x9d\x4f\xf9\x42\xc4\xae\x82\xb2\x96\x16\x2a\x12\xf1\x9d\x68\x3a\xe7\x51\x99\x43\xaa\x76\x8d\x97\x50\xae\x81\x72\x23\xb5\x72\x0d\x52\xe2\xd6\xd8\x1b\x51\x1a\x6b\xa1\xf4\xf5\x60\x47\x23\x51\xba\x7f\x4f\xc7\x97\x44\x22\x29\x1c\xb4\xd2\x86\x6c\xb0\xf3\x51\x75\x71\xe6\x78\x9c\x18\xcf\x64\x3d\x29\xf3\x2a\xc5\x3e\x41\x89\x04\xc2\xf4\xc8\x26\x1d\x92\x36\x86\x41\x3b\xb3\x15\xc6\x8f\x1f\x53\x01\x63\xb9\xcb\x64\xb5\xb8\x8c\x75\xb5\xa8\x5c\xd3\x9a\x16\x21\xf4\x0a\x18\x57\x04\x89\xe1\x38\x3f\x09\x59\x4a\x3f\x08\x66\x40\x2a\x40\x0c\x92\xde\x3f\xc5\xfa\x96\x44\x65\x1e\xff\x96\x2f\xd6\xaf\x75\xa2\xfc\xf1\x31\x1a\x55\x70\xa0\x31\xfc\xcb\x52\xc1\x0b\x63\xd7\x85\xa4\xd4\x7b\x41\x19\xe6\xe2\xe6\x62\x94\x69\x9e\x93\x12\x08\x89\xf7\xdd\x69\xf1\x3e\x46\x9d\xe3\xd3\x63\x66\x29\x3b\x6b\x41\xfb\x7a\x77\xd1\xab\x8f\x80\x1f\x9a\xb1\xa4\xfb\x8e\x33\x36\x58\xc9\xba\x5e\xca\xf2\xe6\x41\x11\xfb\xab\x83\x41\x06\x9b\xcf\x5c\x35\x6d\x0d\x68\x16\xd8\xb0\x04\x7e\xe0\xd5\x05\xe8\xaa\x35\x4a\x7b\x71\x12\x97\x3e\x4d\xc7\x9f\x8c\x8c\xb7\xbb\x10\xf8\xde\x63\xb1\xa4\x9b\x50\xcb\x43\x6e\xd6\xbc\xfb\x72\x37\x6f\x4d\xad\xca\x43\x32\x84\xc7\xef\x03\x07\x38\xb1\x31\xb7\xe4\x0b\x59\x90\xbe\x07\xe6\x83\x91\x8a\x85\x12\x29\x70\xd9\xbf\xc9\x5a\x55\x02\xcd\x4e\x2e\xaa\x17\x73\x71\x44\xed\x12\x47\x17\x42\x72\xdb\x44\xc0\x93\xbc\x2c\xdb\xe9\x0c\x6e\xbd\xfb\x4f\x73\x71\xf4\x27\x63\x97\xaa\x3a\x4a\xc9\x8e\xd3\x0b\xe4\xbc\xa5\xaa\x22\xd8\x0c\x11\xdb\x69\xf4\x35\x6e\x54\xdb\x22\xb9\x34\x7c\xa4\xdf\x09\xb5\x42\xee\x42\xd7\x88\x12\x10\x18\x93\xe8\xe3\x63\x2f\x56\x4a\x2b\xb7\x81\x4a\xec\xc0\xe3\x5a\xef\xa0\xad\x65\x09\x47\x17\x11\xb4\xd4\x25\xd4\xae\xe7\x99\xd4\x18\xf1\x23\x1a\x3c\x2a\xfb\xd0\x1b\x8e\x73\x18\xe4\x94\x68\xb8\x15\x46\xc3\xf1\x63\xd3\xdb\x97\x9d\x37\x8d\xf4\xaa\x24\xb9\x65\x5f\x62\xca\x29\x89\x6a\x93\x74\x80\xac\xeb\xa0\x0f\x91\xbc\xa0\xfc\x26\xe5\x11\xc9\x3f\x20\xa7\x1c\x5d\x84\xcc\x59\x42\x2f\xb8\x6b\xc0\x8a\x13\xa3\xeb\xdd\xbd\x52\x40\x12\x93\xd2\x38\x91\x31\x8d\x45\x70\xd2\x39\x74\xb8\x7b\x68\x40\xe6\xba\x52\xa8\x46\x17\xa4\x4e\xf6\x1e\x3a\x2d\x28\x8d\x16\x13\xcb\xa4\x02\x23\x77\xd4\xf5\x3e\x8a\x6e\xa4\xc7\xf9\x01\x42\xb1\x77\x86\x83\x85\x47\xb7\xd1\x45\x5f\x5c\x64\xcd\x03\x11\xb3\x57\xcd\x62\xf2\x95\xc5\xcb\xf3\x57\xe2\x8c\xff\x2d\x66\xb7\xe4\x0c\x2f\x7e\xf7\x79\xc3\x36\xfb\xf3\x97\x6e\x11\xea\x78\x59\x75\xb2\x82\x16\x74\x05\xba\x54\xc4\xde\x4f\x54\x6c\xfa\x3a\x5b\xe5\xde\xf2\xb4\x1c\xf0\x8e\xac\xaa\x98\x67\x0b\x6c\x96\x81\x49\x4d\x14\xa3\xd2\x7c\x2c\xd7\x23\x4c\x2b\x6e\x25\x59\x28\x12\xc9\x51\xfd\x48\xfc\xe3\x9f\x39\x19\x6a\xb3\x7b\xca\x7a\x5b\x5c\x61\x3a\xfe\x81\x8f\x6d\xad\x4a\x85\x92\xc9\xfd\x09\xb4\x83\x1b\xa5\x49\x6b\x6e\xd4\x9a\xb3\x9f\x35\x6c\xa1\x4e\x2e\x38\x6d\x95\x12\x8e\xd3\x42\xf6\x0c\xea\x65\xb8\xc3\x03\x74\x77\xdf\x99\x36\x4d\xa8\x0a\x1c\x89\x61\x1f\xb8\x30\xed\x96\xe0\x6f\x01\xb4\x58\xf4\x7f\x58\xc4\xbe\x0f\xb6\xe8\x3f\x9a\x25\x8b\xc7\x0d\x1f\xe4\x3c\xa4\xed\x17\xac\x96\x4a\x34\x11\xb1\x7f\xa4\x0f\x7d\xd0\x65\x88\x1a\x74\x32\xc5\x5b\x8c\x38\x0b\x57\x7e\x52\xf1\x8a\xdb\x4e\xc2\x65\xc1\xb5\x46\x3b\xea\x44\x42\x74\xd7\xa0\xc1\xf6\x7b\xc9\x0c\xec\x00\x43\xc1\xf2\x43\x5c\xd5\xc8\x1b\x54\x9a\x16\xee\x2a\xee\xc6\x62\x76\x59\x77\xce\xff\x86\xeb\xb3\x3d\x1a\x5b\x65\x8d\x7e\xda\xc3\xc8\x16\xe9\x4f\xa3\x8b\xb9\x8a\xa0\xef\xbc\x11\x4a\xff\x88\xec\x9b\x82\xee\x21\x72\x42\x6c\xa5\x55\xb8\x67\x17\xa9\x9c\x9f\x40\x4a\x4b\xce\x62\x42\x62\xf1\xf6\xf2\xcd\x37\xef\xaf\x2f\x5f\x7f\x83\x26\xf0\xfa\x87\xaf\xff\x85\xbf\x60\x2b\x68\xd0\x9a\x3e\x87\xae\x9d\xb4\xad\x79\x03\x5e\x1e\x52\x48\x8f\x6f\xae\xcb\x27\x4a\x5c\xe1\x91\xfe\xf9\xb5\xf8\x40\x27\xb9\x96\x76\x29\xd7\x30\x2f\x4d\x8d\xba\xc7\xb1\xdb\x92\xd4\x42\x6a\x3f\xd5\x46\xd4\x46\xaf\xc1\x0a\x0d\x25\x38\x27\x43\x0d\xbb\x6b\xcd\x30\x27\xd5\xb5\x95\xc4\x78\xe6\xb7\x7f\x34\x95\x72\xa5\xd9\x82\xdd\xcd\x4b\x0c\x62\x32\x84\x8a\xf3\xf6\x66\x7d\xce\xd0\xd3\x53\xaf\xf1\xa1\x0f\xbb\x16\xf6\x51\xfd\x3a\x3e\x23\xca\x5a\xa1\x94\x10\xc0\x10\x3b\xe2\x06\x66\x82\xfd\x3f\xf4\xc1\xb8\xd9\x08\x59\xba\x52\xee\x86\x55\x35\x57\xf5\x17\x7b\x65\xe6\xf0\xfb\xd3\xc4\x14\x4a\xaf\x2d\x67\xe7\x1f\xc5\x19\x7b\xe7\x7f\xc5\x70\xee\x34\xdd\x26\x44\x4b\xb1\xe4\xdb\xf7\xb1\x90\x2f\xfd\x22\x06\x81\xd9\xc9\x87\x54\xac\xe9\xbc\x53\x15\x60\x30\x5c\x57\xd1\xf1\xce\x74\x73\x58\x99\xbd\xcd\xc0\x0b\x62\xb9\x0b\x44\xe5\x7d\xa3\xa1\xa2\x36\x5a\x19\xfb\x0e\xc8\x67\xad\x2a\xc6\x6f\xac\x3a\x4e\xfc\xc6\x9a\x6e\xcd\xc5\x83\x45\x34\x77\x8c\x23\xee\xef\xf4\x19\x30\xe3\xc6\x38\x7f\x48\xc8\x77\x76\xf6\x2e\x78\xe8\x67\x67\xc5\xb0\x54\x8f\xbb\x47\x30\xe3\x2e\x86\xc0\x33\xc5\xa3\xc3\x9e\x0f\x53\xde\x2b\xa5\xa0\x99\x79\xd2\x31\x8d\x0f\xa4\x73\x94\x93\xfe\xcb\x87\x0f\xd7\xb1\x53\x21\x86\xd2\x31\x7c\xe8\x4d\x98\x72\x5e\x99\x27\x54\x75\x57\x08\x3f\x30\xba\xcc\xe7\x01\xf6\xbb\xc1\x62\xa7\x60\xe0\xb1\xab\x80\x99\x48\x62\xd0\x80\xdb\x24\xfb\x84\x6c\x5e\x4a\x1b\xcc\x1e\x85\x80\x68\x99\x3a\xbf\x34\x9d\xae\xc4\xd5\xb5\xb0\x52\xaf\x9f\x85\x2a\x24\xba\x1c\xc0\x7e\xaf\x23\xd5\xf0\x78\x4f\x28\xa5\x36\x4f\x29\xb5\xd3\x94\x53\x7b\x7d\xf5\xf5\x3b\xe1\xba\xa5\x86\xd4\x64\x9a\xda\x8a\x03\x16\x4b\xe6\x18\x5b\x42\x9b\xe5\xbe\xf9\xac\x5a\x6b\x3e\xee\xc4\xc9\xe2\xd5\xcb\x82\xfe\x9d\x7f\x39\x7b\xf5\xc5\x67\xc5\xab\xdf\xd3\x87\x57\x9f\xcd\x5e\xfd\x01\x3f\x7d\xc9\x1f\x7f\x1f\xd5\x66\xdf\xed\x31\xe8\x2e\xe1\xe3\x79\x90\xc6\x7f\x32\xc1\xe0\x01\xa7\x46\xc8\xc5\x0c\xdd\xec\x8b\x70\xd4\x05\xf1\x6a\xa1\xcc\x39\x03\x5d\x14\xe2\xbf\xa6\x45\xb3\xd4\x18\xb7\x65\xf7\x39\xea\x05\xba\x63\x0b\x8c\xec\x32\x77\x1e\x99\x85\x5a\x31\xc0\xe3\x5f\x02\x3f\xf7\x8d\x56\x11\xff\x1f\x4d\x6d\x6e\x94\x7c\x42\x09\xf9\x96\x57\x88\x32\x12\xb2\x7f\x6e\xd8\x31\xcd\xa4\x89\x8f\x7e\x2b\xb7\x52\xc8\x35\x68\x5f\xbc\x07\xb6\x88\x1b\xef\x5b\x77\x71\x7e\x1e\xf0\x2d\x8c\x5d\x9f\x5b\xa0\x7e\xab\x12\xce\x37\xbe\xa9\xcf\xe9\x05\x57\xe0\xcf\xbf\x7d\x99\x28\xe5\xbc\x04\x7b\x88\x52\x46\x1a\x5e\x7f\xf3\x46\x80\x2e\x0d\x9a\xa8\xd7\x97\x02\xdf\x54\x2b\x55\x86\xee\x18\x55\x83\x68\xa5\xdf\xcc\x12\xbe\x5b\xb0\x6a\x15\xfd\x85\x98\xd3\x4a\x2f\x81\x9b\xc9\x96\xa6\x45\x70\x27\x14\xb7\x2d\x5a\x6b\xbc\x29\x4d\x4d\xf9\x1b\xea\xa2\x72\x21\x23\xd4\x39\x98\x3b\x57\xcf\x19\xd8\x5c\x76\x7e\x03\xda\x87\xc5\xa3\x74\xe0\x4b\xc4\x86\xbd\x77\x71\xbe\x95\xf6\xdc\x76\xfa\xdc\x41\x69\xc1\xbb\xf3\xbe\xdf\x0f\x79\x3c\x28\x3d\x59\x96\xa6\xd3\x3e\x7e\x9c\x97\xb2\x28\xad\x8f\x60\x51\x4a\x12\x73\x0d\xe4\x2e\x60\xd3\x5a\xa5\x4b\xd5\xca\x3a\x23\xe4\xf1\x3f\xfe\xc9\xb4\x3c\x9e\x26\x66\x7a\xe7\xc4\x9d\x86\xbe\x00\xaa\x1c\x2c\xe3\x2c\x83\xd2\x42\x26\x5f\xab\xa7\x1a\xe5\x5b\x92\x2a\x13\xb1\x69\x2a\xa8\xf3\xc8\xbb\xd1\x16\xfd\x1a\x24\xe6\xe7\xaf\xe3\x7e\xbe\x2a\xf5\x57\x6e\xe7\x3c\x34\x17\x8d\x74\x34\x1b\x86\xba\x8e\x0a\x7c\xfa\xab\x8d\xbc\xf5\xca\xcc\x8d\xae\x95\x86\x82\x3f\x15\x6e\x5b\x46\xf8\x84\x49\xa9\xbf\x5a\x21\x36\x68\x48\x4d\x0d\x05\x7e\xa0\x87\xee\x39\x8a\xde\xd3\x3d\x54\xba\xbe\x57\xce\x03\xf7\x32\x53\x71\xa7\x94\xce\xc7\xe6\x5b\x77\x6f\x77\x1b\x7c\xf4\xa0\x2b\xa8\x22\xa9\xca\x0d\x1c\x90\x9d\x7f\x83\x21\xa3\x0f\x0d\x85\xfb\xe7\x1a\xa2\x28\xd7\x9f\xfa\xaa\x96\xeb\x18\x46\xc6\x25\x03\x99\x6e\x60\x27\x3a\x27\xd7\xe8\xbd\x92\x5d\xfe\x35\x0e\x9a\x35\xfc\xdd\x47\x70\xa0\x7f\x87\xdc\xff\x17\xf4\xe1\x64\x55\xd9\xc0\xbb\x7d\x63\x4c\xe4\x60\xd2\xa3\x69\x26\x49\x69\xd4\x28\x54\x88\x5b\x1c\xfd\xcf\xb3\xa3\x45\x9f\x0b\x5e\x1c\x05\x13\x7a\x44\x3b\x25\xe1\x99\x45\xbf\x1e\xac\xa3\x97\x39\x0b\x45\xe1\x8b\x06\x4f\x45\x2c\x32\xcd\x2b\x59\xf6\x13\x68\x31\xc5\x74\x74\x76\x34\x6a\xc7\x95\xce\xdd\x1a\x7b\x48\xce\x8b\x44\x3b\x3c\xce\x8a\x10\xe9\x35\x24\xf1\x4c\x8c\x0f\x8b\x9c\xfa\xce\x81\x4d\xfb\x6a\x79\x64\x8e\xcc\xeb\xa3\x1b\x92\x27\x14\x01\x37\xae\x66\x4d\xb4\x5f\x7c\xf1\xe5\x68\x93\x81\x5f\x0e\xdd\x64\x78\x3c\x4c\x58\xf4\xd1\x1f\xf5\xbe\xd2\xc1\x04\x9e\x1b\xb6\xc5\x3a\xe2\xa0\xb0\xcd\x9e\x8f\x32\x44\x90\x0e\x07\x22\x41\xc9\xe2\x3e\x04\x9d\xa0\xf5\x10\xee\xdd\x6c\xff\xa0\xf4\xfe\x7d\x03\xb4\xbf\x7d\xc9\x75\xd9\xe4\xdc\x1d\x58\xec\xb1\xd8\x43\xa2\xc4\xe7\xff\x98\xb2\xef\x7c\xbf\xec\x2b\xab\x4a\x51\x65\xae\x4e\xec\x10\xe0\xa2\x6b\x5f\xd1\x20\x5e\x95\xea\x9d\x8f\xf3\x6d\xfe\x03\xfd\x3c\xff\x71\xdb\xcc\xd9\x7d\xfa\xc7\xb7\x7f\x7b\x13\x84\x76\x30\x2b\x32\x60\x68\xf7\xcf\x19\x14\xeb\xe2\x42\x2c\x6e\x60\xe7\xbc\xb1\xf0\x55\x51\x14\x33\xae\xe0\x19\x8b\x1f\x16\xc7\xbd\x57\xb8\x6d\x9e\x2e\xe1\x87\xe8\x0e\x13\x7d\x7e\x1c\x68\xd2\x23\xe8\xd9\xdb\x4e\xef\x0d\x8f\x3e\x83\x88\xa7\x82\x65\xb7\x7e\xb8\xf0\x97\x7c\x61\x0b\x8d\xf1\xc0\xaf\xad\x43\x33\x55\xc8\x8e\x85\x5f\x22\xff\x33\xd6\xd2\x7b\x59\x6e\x20\x35\x64\x89\x48\xb1\x99\xc0\x13\x9e\x71\xbb\x0e\x0f\x32\xac\x8c\xbd\x95\xb6\x62\xf6\x1d\x20\x37\x77\x9d\x6b\x41\x3f\x4c\xab\xf7\xfc\x1c\x9f\x82\x97\x76\x0d\x9e\x8e\x47\x35\x0d\x54\x4a\x7a\xa8\x77\xb1\xbd\xd3\xa7\x16\xfa\x5a\x3a\x87\xa7\x5b\x1b\xc9\x96\x73\xb8\x76\x30\x3f\x87\xa8\x1a\x2b\xb5\x23\x05\x1a\x4d\x96\xf4\xd1\x64\x19\x12\xb7\xe0\x47\xd0\x3c\x30\xdc\xd6\x3b\x51\xcb\x4e\x13\x7d\x10\xcb\xb1\xf4\x9f\x5d\x7c\xfe\xf2\xe5\xe7\x03\x97\xe2\x70\x81\xbf\x5b\xde\x71\xa9\x1e\x4e\xaf\xd7\x15\xba\x28\xf8\xce\x01\x84\x46\x37\xce\xbb\xd0\x44\x4b\xaf\x04\x06\x45\x83\x4a\x2d\x5f\x51\x32\xd4\x78\x1e\xa0\x36\x6b\x37\xad\xe8\xfa\xdc\xde\xa8\x5e\x73\x48\xc0\x97\x04\x7a\x4f\x84\x47\xe1\xe4\x3d\xf9\x8f\xa8\xf6\xc8\xd8\x86\x12\xd0\x54\x7e\x0f\xf5\x62\x84\x1a\xf3\x21\x7d\x1f\x44\xd6\x6b\x97\x25\xfb\xfa\x32\x4e\xf1\x2e\x83\x9c\xb7\x38\xe6\x60\xfb\xb1\xb9\xaa\x72\x94\x7b\x9a\xbb\x52\xd2\x60\xc1\x09\x4d\x25\xf0\x87\xb9\x37\xf3\x9f\xc0\x9a\x53\xb1\x02\xe9\x31\x36\xe5\x0a\xd8\xb2\xf3\x61\x48\x3a\xfe\x9e\x52\xd7\x54\x4a\x6f\x40\xe2\xf2\xab\xae\xee\xbd\x8a\x50\x9d\xef\x1c\x84\x64\xd5\x54\x9a\xea\x37\xaf\xc9\x90\x4c\x91\x30\x24\xd6\x8f\xcb\xe3\xf8\x8c\x59\x32\x50\x41\x43\xa4\xb9\x11\x2e\xd4\x7b\x43\xe9\x8a\xc5\xa6\x95\x45\xf6\x70\x11\x58\xb7\xa8\x60\x9b\x7b\x9f\x37\xf7\x3c\x96\x2f\x76\x5a\xbc\x43\x63\x1a\x03\xb5\x88\x4e\x65\xca\x2e\xf5\xe6\x64\xf1\x66\x63\xa8\x1d\x1d\x25\x23\x99\x9b\x29\x6a\x34\xe0\x6d\xec\xb2\xfd\xb9\xe4\x60\x58\x77\xd1\x23\x6b\xdf\x49\xd9\x28\x2e\xe6\x5b\xb1\x28\xdb\x6e\x11\x3e\x3e\x72\xcf\x69\xb7\xa9\x1c\xfb\xe0\x9e\x59\xff\x3f\xe4\x05\xbf\x87\xa0\xc7\x48\x21\x50\x3f\x56\xda\x40\x28\xc9\x1b\x4b\x83\x8c\x2d\xd8\x12\xd1\x59\x53\x28\x80\x76\x86\x87\xc9\x33\xc3\xb6\x4f\xa6\xd3\xbe\x49\xed\xda\x54\x07\x6e\x34\x40\xbc\xef\x70\x1b\xa5\x49\x21\xc0\x21\x5e\x7e\x9c\xfa\xd4\x69\xde\xe0\x3a\x5d\xa8\xd2\x3b\xa5\xb1\xe6\x8d\x86\x5c\xef\xa8\x1b\x3b\x43\x66\x62\x2c\xfa\xd8\x89\xb3\x33\xd4\x3e\x67\x67\x59\xc6\x71\x16\x15\x0c\xc1\xdf\xbb\xdd\xc3\x91\xea\x4a\x11\x6a\x65\x6e\x69\xd0\x00\xc1\xb0\x3a\xd2\xc6\x67\xfe\x71\xaf\x9d\xab\x6c\xf4\x13\x71\x9b\xa4\x65\x82\x3a\xc5\x3a\x77\xd2\x52\x7e\x3c\x8c\x96\x97\x5a\x74\x6d\x0b\x56\x70\x5a\x3b\x99\xf2\x09\xb2\x06\xff\x27\xd2\x54\x69\x81\x66\xb8\xae\xa1\xce\xa4\x77\x4c\xd3\xc8\x10\x1b\xe9\x04\xea\x3e\xa4\x4d\x29\xdb\x90\x85\x25\xb8\xcc\x78\x69\xfa\x0d\xad\x8e\xac\x6b\x7e\x9d\x08\x12\x8f\xeb\x10\x59\xba\x4f\x8a\x1e\x76\x08\x0f\xec\x04\x1b\x1b\xca\xd8\x11\x16\x33\x7d\x46\x73\xf8\xe1\xc4\xc6\xd4\xd5\xc5\xd9\x60\x7a\x9e\x9c\xee\xd4\xd6\x10\x20\x05\xcb\x7f\x46\x66\xa2\xef\x2b\x13\xf7\x36\x96\x91\x51\x63\xd5\x93\x9a\xc1\x0e\x6c\x11\x8b\x39\xa7\xfd\x46\xb1\xb1\xc3\xf2\xcb\x38\x2a\xc1\x41\x19\xd2\x37\xe4\xad\x5c\xf4\x2d\x79\x62\x3f\xbe\x92\xca\xd4\x84\x2b\x75\x9e\x71\x07\x02\x35\xe4\xaa\x50\x91\xec\xb9\xb1\xe7\x39\x5c\x78\xd5\xd5\x75\x02\x35\x1c\xe1\x0f\xbb\x67\x68\xd4\xe6\xc0\x6d\xc2\x97\x6f\xbe\xf9\xfe\x5f\xdf\xbd\xbd\xfc\x70\xf5\xb7\x6f\xfe\xf5\xfa\x87\xb7\x7f\xba\xfa\xf3\x5f\xdf\x5d\x7e\xb8\xfa\xe1\x2d\x3e\xf2\xed\xfb\x1f\xde\x0a\x66\xad\xa2\xbf\xc7\xa2\x5f\x21\x74\xbc\x12\x68\xea\x37\xc1\x28\x98\xbc\x0f\x1f\xd1\x19\xa2\xb1\x17\x74\xf1\xb1\x13\xf0\x14\x9e\xe5\x7e\x48\xaf\x8f\x7a\x27\x67\xc4\x3f\xa9\x97\x18\x9e\x81\x6b\xb3\x1f\x2c\x3f\x60\xc7\x87\x08\x05\x6e\x90\x83\x33\xa8\xc1\xef\x1d\xf7\xf0\xec\x72\x04\x36\x52\x6b\xa8\xe7\x39\x9f\x3d\xe4\x4a\x4c\xc7\x1f\x01\x52\x08\xa7\xa5\x13\xa1\xe1\xcd\xac\x86\x13\x3d\x7c\xc2\xaf\xa5\xee\x35\x05\xcf\x43\x50\xa7\x72\x04\xc3\x97\xf9\x20\xa9\x89\x6d\x98\xd3\xfe\xfa\xee\xca\x4d\x22\xaf\xf4\xcd\x2f\x8a\x7a\x05\xce\x2b\x9d\x3a\xa6\xc7\xc3\x32\x22\xdb\xc5\xcf\xc1\x3f\x3a\xe3\xbf\x3a\xf5\x27\x71\xf8\x99\x44\x8c\x80\x7e\x11\x2a\xa6\x30\xe5\x20\x32\x6e\xe1\x17\xa1\x21\xc1\xa1\x77\x5d\xdf\x91\xba\xd7\x43\xd7\xdf\x0f\xd6\x2d\x11\xe8\x92\x44\x71\x72\x13\x19\xbc\xfd\x1d\x88\x93\x70\x3b\x8d\x4c\x13\x11\xd1\xb1\xb6\xe6\x06\x6c\x76\x97\x03\xd9\xba\xa3\xa0\xf8\x8e\x4e\x27\xf6\xfe\x73\xcf\xee\xa0\x9d\xb7\xd6\x54\x5d\x09\x77\xcb\xee\xa3\x37\x1c\xb6\x3a\xd8\xd1\x4a\xd5\x1e\x6c\x38\xce\x79\xe4\xeb\x07\x55\x35\x5f\x5f\xe0\xc2\xeb\xe1\x3e\x28\x42\x68\xd8\x76\x2c\x36\x20\x2b\xb0\xe2\xa8\x84\x79\x30\xef\x1b\xe5\xbc\xb1\xbb\xa3\x78\x31\xd4\x7b\xa5\xcb\xa0\xc0\xd1\x96\xd0\x18\x17\x58\x45\x8e\x56\x1d\xde\x1f\x78\x83\xd0\x98\x2d\x1b\x51\x29\x56\x9d\xcf\x6e\x6f\x8a\xa1\x62\x32\xe9\xb3\x0c\xc1\xde\xb6\x71\x04\x3f\x35\x9c\x27\x94\xe3\x0c\x53\xf4\x79\xf2\x20\xc2\x6f\xa4\x16\xaf\xa2\xec\x0f\x4b\xbb\x4d\x52\xea\x73\x34\x0a\xf2\xe1\xfe\x80\x48\xc1\x68\x4b\xe8\xe4\xde\xb3\x1a\x69\x2d\x88\x97\xc5\xab\xcf\x05\xc3\x52\x4b\x55\x2b\xbf\x13\x2b\xf5\x11\x9c\x38\x19\xca\x45\x46\x8e\x21\x31\xdc\xe9\xa3\xbd\xd1\x70\xd5\x57\x72\x9a\xfa\x42\x1f\xa5\xb8\xa3\xd1\xcd\xcc\x7c\xdf\x56\xc0\xf5\xc7\xa7\x9c\x8d\x7d\x43\x2b\xdc\x93\x79\x1a\x1f\xe6\xb8\x5b\x9e\x36\x8c\xd1\xa8\xc5\xf0\x33\x4b\x2b\x0d\xdb\x96\x2b\xa3\xf4\xba\x66\xbe\xa5\x06\xea\xd8\x8a\x93\xbc\xe1\x33\xde\xec\x59\x3e\x9f\x46\x3c\x65\x34\x15\x2b\x50\x48\x29\xa8\xd0\x25\x5d\xa6\x79\x7c\x9c\x0f\x5c\x0d\x7d\xd2\x5b\x76\xda\xa2\x7b\x9e\xc8\x98\xf5\x38\x11\xa7\xd3\x52\x9c\xf0\x15\x0b\x64\xcd\x93\x23\x7e\xf6\xa2\x36\xe5\x0d\x9d\x81\x87\x1a\xf7\xde\x5c\x2c\x8d\x77\x47\xa7\x45\x51\x2c\x8a\xb7\x3f\x7c\xf8\xe6\xa2\xbf\xb9\x23\x10\xaf\xaa\x1c\x6b\x05\x49\x93\x18\x8d\xe2\x39\xcc\xa9\x66\xb8\xd4\xb1\xc7\x65\x7b\x91\x8d\xbb\xbe\x10\x61\x6c\xfe\xfc\xd6\xaa\xe4\x05\x35\xb2\x75\x61\x60\x46\xd2\x4d\x6f\x91\x02\x16\xd0\x41\xa3\xca\xaa\x48\xba\xa9\x57\xbb\x7d\x9a\x52\xa4\xc5\x48\xe4\x92\x2a\x1e\xa4\x14\xf7\xe2\xbe\x67\x30\x35\xf9\x08\x21\x74\x99\x14\x0e\xbd\xcb\x30\x53\xc6\x98\x0c\xfa\x92\xca\xba\xab\x60\x5e\x21\x17\x48\x8f\x3f\x0c\x06\x57\x1e\x2c\xb9\x69\xde\x05\x57\xc2\xa3\x57\xcf\xb3\x7d\xb8\x15\xe9\x31\xd2\xd3\xb2\xde\xfd\x14\xf2\x5a\xc1\xe9\x29\x4d\x05\x7d\x69\x42\x56\xd5\x70\x0a\x25\x4d\x00\x51\x34\xc1\xb8\xf5\xee\x4b\x41\x03\x86\x99\x10\x2c\xf6\xb8\x9a\x47\x96\xfb\x0c\x8a\x16\x0b\x52\xb8\xe1\x2f\x84\xeb\xb8\xad\xb0\x6f\xba\x0b\x37\x5f\xe6\x28\x0d\x7a\x45\xa3\x17\x30\x79\xb5\x4f\xe2\xe8\x03\xac\xfd\x5b\xd9\x40\x76\xff\x1b\xbf\x97\xcd\x0a\x64\x9c\x45\xd5\x38\xee\xec\x32\xe5\x4d\x21\xbe\xe6\x95\xb3\x9b\x8e\x8e\xfe\x73\xc6\xda\x74\xd1\xd2\x7f\x99\xe3\xb3\x47\x83\x3b\x49\xe4\x12\xea\xf9\x0d\x1c\x32\xdb\xf7\x3d\xb5\x90\x4d\x62\xa3\x2a\xd0\x5e\xad\x76\x3c\x97\x45\x53\xdb\x46\xfb\x90\x99\x4b\x48\x06\xdc\x22\xaa\x84\x24\x8f\x69\x86\x99\x4d\x63\xd7\xe7\x19\xd2\x13\x98\x52\x06\xe6\x60\x5c\xb3\x7c\xcd\x63\x31\x0e\xb8\x0e\x89\x3b\xa5\xdc\xe8\xbe\xa7\x17\x7d\x5d\x08\xb4\x6c\xd5\xd3\xd5\x41\xf1\x8f\x97\xd7\x57\xe2\xeb\xf7\xdf\xdf\x3f\xe3\x85\xc6\xad\x9f\xac\xc9\xcb\x1b\xb4\xb5\x90\x8d\x89\xe0\x50\x93\x8f\xbb\x42\xf3\xd1\x2d\x73\xfb\xa4\xf7\x24\xfe\x70\xdb\xdf\x91\x08\xda\x85\xb4\xb7\x24\x1b\xcd\x9b\x80\x2a\x33\xb1\x4b\xa8\x0d\x0f\xb8\x4e\xdd\x8c\xb0\x04\x2a\x16\xf0\x5b\x68\x45\xbc\x95\xda\xad\x28\x67\xa3\xb5\xf1\xb1\xc8\xa3\xab\xd1\xd5\xc0\xf9\xb1\xc6\xe6\xf1\x70\x7b\x1d\xee\x3f\xc3\xe0\x19\x24\x2a\x38\xeb\x3e\xcf\x76\x7c\x60\x93\x46\x4e\x23\xee\xd5\x88\xf4\x43\x0d\x7c\x72\x77\x3d\x93\x88\x19\x30\xba\x81\x9d\x3b\xdd\xc7\xe6\xe0\x6b\x87\x3f\xc4\x96\xd5\x4f\xc1\x21\xac\x9e\x2a\xaa\x81\x67\x9f\x8e\x7d\x23\xd8\x5e\x22\x25\x85\x30\xe1\x33\x71\x72\xd6\xb6\x20\x9d\x53\x6b\x3d\xba\x39\x85\x68\xd0\x03\x32\xa3\x3f\x17\x57\x5a\x94\x32\x24\xe6\xd2\x63\xca\x09\x72\xbc\xf4\x7a\xd6\x5b\x74\x5a\x9f\x8b\x28\x2f\x82\x2d\x60\x61\xa0\xbe\x00\xce\xc5\x45\x08\xc5\x07\xb2\xd7\x5c\x9b\xa4\xf8\x26\xf8\x74\xac\x4a\x56\x5d\x2d\xc2\xed\x76\xf0\xd1\x3b\xbe\x86\x34\x56\x62\x2d\x1c\x3b\xa1\x4d\xba\x94\x20\x5c\x3e\x2a\x64\x18\xdd\x9f\xb8\x84\x34\x47\x9e\xd3\xbb\x46\x0f\x48\x3b\xbc\xd2\x35\x5c\xf9\xe6\xe8\x1a\x83\x99\x70\x21\xcc\xe3\x95\x31\xcc\x6b\x96\x40\x86\xba\xaf\x6a\xab\x06\x1d\x73\x0b\x6b\xe5\xbc\xdd\x3d\x87\x31\x0b\x3e\x9b\x79\x5e\x88\x7f\x60\x02\x62\xef\x34\x4f\xa0\x69\xfd\xee\xb4\xe7\x8b\x14\x98\x4e\x70\xca\xa3\xbd\xc9\xbd\x99\x8b\x0a\x3c\x94\xd9\x65\x32\xf9\x30\x9e\x5a\x4d\x70\x59\x4c\x3e\x30\x29\xa3\x3e\x3f\x51\xbd\x59\x8e\xbf\xcb\xd9\x81\xe2\xa1\x6c\x8a\xba\xb5\xa6\x01\xbf\x81\xee\xd1\xb3\x46\x8f\x09\x11\xaf\xd3\x2a\x71\x12\x29\x1f\x30\xe8\xff\x3a\x8f\x81\x75\x96\xfc\x62\x0f\x27\x5e\xc6\xcb\x33\x2f\xfb\xd7\xd8\x87\x01\xa4\x45\x68\x2d\x58\xa0\x21\xea\x3f\xbe\x31\x5a\x79\x63\x17\xbd\xb1\x61\xbf\x35\xf6\xf6\x30\xc1\x63\x4f\x00\x53\xd4\x95\x56\xb6\xe3\xb0\x70\x36\x8e\x0b\x7b\xdc\xa3\x2f\x5e\x7c\x08\x8e\x0e\xd7\x48\x5d\x1a\xd3\xd9\x4a\xbb\x13\x79\x6d\x35\x73\x49\xa9\x04\x18\x06\xc6\x0b\xf1\x77\xdc\xcc\x7f\xe3\xeb\x1a\x59\x07\x05\x58\x1c\x84\xd9\x74\xdd\x26\xe3\xf1\x46\x95\xd6\x5c\x87\xbc\xff\x1b\x7e\xb2\x10\x7c\xa5\x14\xd1\x25\x17\xff\xb0\x48\xb8\xa8\x45\x06\xcd\x13\x71\x9c\xda\x98\xf8\xf6\xcd\x7f\xa7\x07\xac\x07\x5b\xfc\xfd\xf2\xdd\xdb\xab\xb7\x7f\x0e\x37\x4e\x93\x2b\x94\x5d\xa8\x31\xa2\x77\x88\x44\x43\x40\x92\xae\xb1\xa2\x04\x54\x68\xb5\x5b\x2b\xbf\xe9\x96\x45\x69\x9a\xf3\xd2\x58\x30\xee\xbc\x67\xc9\x79\xa4\xe9\x3f\xae\x73\x36\xa5\x9e\x49\xfa\xfd\x3f\x83\x52\x4c\x4b\x50\x43\x9f\x8a\x59\x86\x65\xaa\x21\x42\x55\xfc\x0f\xd3\xd1\xd1\x52\x21\x3f\x36\xb9\x37\x39\xa2\xde\xc4\x46\xe7\xa4\x57\xf7\x18\x37\x5d\xff\xa2\xfc\xc6\x74\x7e\xfc\x50\x62\x02\x0a\xad\x59\xec\x27\xbe\xa8\xe3\x19\xc4\xc4\x87\x36\xd9\x66\x9b\xbf\xab\xcf\xf6\x0f\x5f\x7c\xf1\x87\xc5\x8c\x7a\x24\xe8\x9a\x5f\x66\xca\xc0\xdf\x93\xd7\xd8\x86\x63\x39\x24\x3a\xa6\x86\xd4\x7b\x24\x1d\x95\x74\x52\x8e\xc3\x36\xee\xfb\x96\x7e\x9c\x57\x75\xf7\xea\x0c\x66\xbf\xdb\x79\x9a\x03\xb3\x96\xf3\x4f\x0d\x77\x3f\xc4\x0c\x4e\x10\x0d\xee\x79\x79\x23\xdb\x68\xcf\x1f\x10\xf0\x3e\xa7\x9d\xb9\x19\x27\x7c\x3d\x30\xdf\x99\x43\x21\x9d\x5f\x64\x90\x6f\x60\x77\x5a\xf4\x99\x8a\xfc\x12\xda\x1a\x56\xb1\x0f\x8e\xec\x69\x7f\x89\xcc\x2c\x16\x4e\xe3\x80\x3f\x7f\x21\x46\xec\x2e\xcb\xd0\x9b\x74\x79\x52\xab\x4c\xe6\xcd\xf9\x78\xed\xed\x98\xda\xac\xd6\x02\xc7\x65\xc6\xaf\xab\xeb\x39\x0f\xc5\x3c\xe1\xd8\xd5\x75\x57\xd7\xe2\x3d\xad\x12\x94\x88\x03\x4f\x57\xb3\xe0\x1f\x78\xf9\x74\xe1\xaf\xa9\x66\x29\xd0\x1c\x2c\x48\xea\xc9\xa2\x72\x87\xed\xf8\x42\x66\xf6\xcf\x38\xfa\xd4\xe9\xea\xa9\xe4\xb0\x51\x21\x39\x5f\xac\x94\x31\xa8\xcb\x2e\x97\x6a\xa4\xee\xc8\x13\x31\x76\x46\xfe\x29\x3a\xc6\x3b\xd3\x1d\x6f\x07\x46\x6a\xd4\xd4\x4d\x7d\x2c\xfd\x9a\x2f\xb2\x7a\x08\xd8\x84\x41\xd8\xdd\x22\xeb\x7e\x88\x5f\x1d\xb0\x98\x65\x77\x84\x31\x7a\x99\x57\x8f\x58\x73\x8d\x1e\xb7\xb8\x37\x4d\xbc\x3f\x49\xbc\x43\x2d\xdf\x5f\x05\xfe\x29\xc8\xce\x9c\x11\xca\x63\x40\xd1\x35\x31\x64\x1e\xd3\x54\x85\xae\x8c\xd6\x52\xf2\xb8\xb8\x5a\xe1\xca\x36\xd8\x3b\x86\x33\xba\x4d\x70\x02\x17\xdc\x1d\x25\x12\x68\x73\x33\x46\x5e\xea\xa4\xc3\x87\xe9\xe1\x67\xe0\x76\xf3\x01\x1e\x7c\x01\xf9\x88\x2d\xf9\xaa\x71\x13\x27\x25\x49\x49\x99\x8a\x06\x5e\x50\x8d\x04\x05\x92\x2a\x52\x7b\x25\x04\x21\xbc\xbc\x01\xdd\xfb\xd0\x93\xfc\xd6\x9f\xcf\x40\xaf\xfc\xcc\x16\xa1\xd1\xfc\x64\x0a\x11\xd2\x62\x7b\x72\x1e\x15\xd8\x4a\x70\x74\x89\x2e\xd4\xae\x05\xb1\x18\x4e\xe7\x55\xa6\xbc\x01\xcb\xe0\x7f\x74\x46\x2f\x7a\xf5\x15\x2e\xf4\x7e\x42\xd5\x15\x34\xe6\xde\xc4\xa8\xcf\xfe\x16\xbd\x56\x12\xcd\xe7\xf9\xad\x64\x59\x7b\xdd\xbd\x31\xdb\xfe\xae\xf9\xc8\x4e\x2c\xd0\xa0\x15\x77\xcd\x85\x72\x5f\xe7\xa0\x4f\x97\x50\x95\xe8\x80\x83\xba\xf7\x34\xde\x21\x90\x87\xbe\xf4\xc4\x8f\xdc\xf2\x61\x22\x20\x34\x94\x4d\xf5\xe7\xfd\xf6\x8f\xe9\xd0\xd9\xba\x43\x2e\x4b\x20\x42\x0c\x52\x7b\xb5\x9b\xf3\x17\x4c\x1d\xda\x85\x84\x47\xf2\xe1\xfb\xf7\x22\x7b\x8b\xde\x98\x89\x5a\xdd\x80\x58\x40\xb5\x86\xc5\x4c\x2c\x5a\xe9\x5c\xb8\xb9\x82\x67\xc2\x2c\x80\x2e\xed\xae\xf5\x8b\xa9\xae\xc6\x3e\x54\xdf\xef\x6b\xcc\xa6\x99\xee\xe8\x6e\xc4\x6d\x64\x73\x59\x8f\xd8\xc6\x78\x0e\x93\xc6\x9c\x06\x6d\xa8\x77\x60\x16\xd0\x3f\x1c\xbf\xc3\x2a\x23\x53\x78\xdd\xc0\xee\x89\x71\x0b\xd3\xe0\x9f\x46\x3e\xb2\xf1\xc6\x2a\xbf\x7b\x0c\x35\x03\x8e\x9f\x7a\xda\x59\x7f\xd1\xa7\x61\x9f\x37\x28\x0d\x46\xda\xa1\xff\xea\xa3\xe8\x6f\x52\x23\x49\x2c\xa6\x49\x31\x5e\x4c\xc4\xbf\xad\x14\x62\x9d\x41\x2e\x04\x97\x32\xd9\x13\x4f\x12\x30\x90\x1d\xca\x9a\xaa\x1a\x42\xdb\x76\xac\x00\x26\x34\xaa\xbc\xc8\xcd\xd7\x12\x92\x18\x5b\x9e\xed\x50\x9e\xa8\xc6\xdf\x90\x21\x68\x1e\x39\x55\x21\x1c\x94\x5d\x6a\xaf\x2f\x8d\xd6\xdc\x3e\x80\x7e\x5b\x58\x16\xea\x2a\x7d\x69\x46\xf4\x89\x67\xbd\xaa\xb0\xa2\x91\xbb\x94\x8d\x8d\xfd\xcb\xd9\x06\x03\xec\xd7\x97\x54\x03\x89\x57\xcb\xa3\xea\x21\xb7\x66\x2b\x6b\x55\xc5\x5b\x53\x94\x5e\x13\x52\x1b\x8c\x93\x63\x21\x9f\x1e\x3b\x09\x9f\x0a\x1d\xbf\xc5\xaf\x70\xdb\xf2\x34\x56\x59\x79\xde\x2a\xf4\x58\x28\xbd\xb2\xd2\x79\xdb\x95\x64\x6f\x62\x14\x55\x0d\xe7\x32\xc7\xcd\x16\x7c\x21\xc1\xd3\x28\x1e\xa5\x99\xce\x73\x54\x7d\xb9\x36\x3d\xfc\xae\xd3\x81\xf2\x0e\xb7\x9d\x56\x20\xeb\xf8\x3d\xab\xbc\x00\x5a\x8f\xd5\x4a\x95\xb1\xef\x82\x6e\xd9\x43\x5d\xfb\x35\x9b\x9a\x7c\x38\xe5\x1d\xc4\x66\xe7\xf0\xd2\x41\x8a\xe3\xde\x5d\x8f\x72\x06\x8f\x77\xc0\xee\x35\xf3\xc3\x51\xae\x07\x12\x9e\xf1\xe1\x94\x70\x70\xc1\x73\xa5\xf2\x48\xf2\x13\xf8\x86\x04\x36\x7f\x86\x53\x26\x1c\x22\x53\x49\xea\xc4\xd8\x41\x31\xf3\x34\xff\x9e\x52\xd1\xb3\x22\xba\x78\xa1\x05\x66\x2f\x02\x53\xfb\x5f\x76\x9a\xb5\xf3\xcb\xf1\xdd\xcb\xfd\x20\x41\xf6\x75\x56\xa3\xe9\xac\x67\xe0\x92\xfc\x32\xb9\x7e\xea\xd4\xa0\x24\x7f\x3c\x4e\x8c\x18\x63\x95\x2e\x64\xaf\x7a\xb6\xfb\x5d\x9c\xe7\x78\x2a\xb7\x9f\x17\x98\xf6\x34\x87\x3b\x89\x55\x93\xbc\xbc\x19\x2f\x94\x25\x35\x15\x41\x99\xd4\xb3\x46\x3b\xee\x95\x55\xea\x63\xd2\x15\x5f\xdb\x88\x81\xc6\x56\xaa\x5a\xc6\xfb\x1f\x2f\xaf\xaf\x44\x23\xb5\x5c\xd3\x05\xce\x29\xbd\x3e\x40\x52\x3d\xd7\xd0\xe3\x49\x5b\x8f\x5c\xb9\x81\x83\x23\x71\x7e\x38\x76\x80\x71\x4c\xe1\x65\xb8\xa6\x34\x9e\xd2\xf8\xeb\xbd\x06\x17\x44\x1c\xf4\x45\x57\x7c\x39\x84\xdf\x64\xdf\xbe\x88\x07\xac\x9c\x68\xbb\x65\xcd\x77\x41\x67\x57\xd7\x0c\x97\x38\x30\x27\x4d\xf9\xe7\x1e\xbe\xeb\xef\x96\x9b\xfe\x26\xb5\xc1\x58\x74\x82\x75\xe8\x57\x77\x4d\xec\x08\xa5\x6b\x1e\x5b\x40\xfa\xfb\x81\xee\xda\x64\x68\x70\x29\x28\xbe\xef\x83\x46\x6f\x65\xc9\x2b\x3e\x95\xa0\x7f\xe0\x15\x0e\x91\xf4\x80\x78\x44\x2a\x37\x88\x31\x3b\x29\x35\x2e\x16\x61\x66\xa5\xbc\x70\xe9\x24\xd7\xc6\xb2\x7a\x7a\xf8\xae\xe9\xe9\x61\xa0\x54\xb8\x8e\x2b\xa6\xf2\x42\xaf\x1e\x82\x99\x4a\x16\x4a\x9c\x84\x9b\xb2\x9d\x38\x3b\xfb\x56\xc2\x1a\xec\xd9\xd9\x69\x91\x6d\xb5\x4f\xa7\xfd\xbb\xce\x48\x3a\x63\x16\x9a\x14\x69\x40\x32\x3e\x1f\xc3\x92\xbc\xd5\x78\xea\x38\xa6\x8a\x28\x8f\x48\x00\xea\xac\x3d\x2f\x0a\x2a\xf9\x06\x51\x52\x5c\x5a\xb1\x92\x5e\x26\xb1\x71\xc3\x5b\x17\xc6\xdd\x63\xa7\x13\xc3\x1d\x07\x62\x14\xae\x56\x48\xec\x16\x90\xcb\x79\x3b\xa9\xc3\x69\xd6\x9d\xe8\x5e\xcc\xf1\x71\xb2\x69\x6b\xb0\x73\x1f\x2f\x19\x3d\x40\x39\xf3\x2b\x21\xdd\x14\x35\xc7\x51\x69\xb4\xf3\x47\x53\xb0\x5b\x69\x65\xf3\x48\xe0\x69\x1e\x81\x5e\xce\x96\x79\x75\x74\xfa\xe2\xff\x07\x00\x00\xff\xff\xef\xee\xac\x5d\xd2\x81\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x6e\x24\xb9\xf1\xd8\xff\xfb\x14\x84\x12\x40\x1f\x98\x69\xed\x9e\x71\xbe\xb3\x92\x8b\xa1\xec\x9d\x6d\xdd\xdd\xee\x29\xbb\xb2\x9d\xc0\x31\x3c\x9c\xee\x9a\x19\xae\xba\xc9\xfe\x91\xec\xd1\x8e\x83\x00\x79\x8d\xbc\x5e\x9e\x24\xa8\x2a\x92\xcd\xee\xe9\x95\x46\x7b\xd6\xe1\x04\xfc\xb0\x7f\xac\x46\xea\x2e\x16\x8b\xf5\xfd\xc1\xf1\x56\x2a\xef\x2e\x5e\xcc\x85\x96\x0d\x5c\x08\xb9\x5a\x29\xad\xfc\xee\x85\x10\x6d\x2d\xfd\xca\xd8\xe6\x42\xac\x64\xed\x00\x7f\x63\xcd\x4a\xd5\xe0\x2e\x5e\x08\x31\x17\x3f\x74\x4b\xb0\x1a\x3c\x38\xfe\xa8\xa5\x57\x5b\xa0\x9f\x7f\x6a\x41\xbf\xdf\xa8\x95\x7f\x21\x44\x05\xae\xb4\xaa\xf5\xca\xe8\x0b\x71\x59\xd7\xe6\xce\x09\x6f\x44\x69\xb4\xc3\xc5\xb5\xb8\xdb\xa8\x72\x23\xb4\xa9\xc0\x09\xbf\x01\xa1\xb4\x87\xb5\x95\xf8\x82\x68\x4d\x75\xe2\x4e\x85\xb4\x20\xa0\x56\x6b\xb5\xac\x71\x01\x81\x00\x96\x20\x5c\xb9\x81\xaa\xab\xa1\x12\x46\xcf\xc4\x52\x3a\xfa\x49\xd4\x72\x09\xb5\xc3\x9f\x10\x1c\x02\x9e\x19\x2b\xee\x94\xdf\x10\x6c\x3b\x6f\x4d\x95\x36\x2a\xa4\xae\x08\xa4\xd4\x5e\xcd\xe3\x6f\x27\xa1\xb5\xa6\x42\x0c\xa5\x27\x7c\x64\x6d\x41\x56\x3b\x61\x3b\xad\x95\x5e\xe7\xcb\xb9\xe2\xca\xff\xbf\xff\xf3\x7f\x1d\xc1\xad\x94\x93\x4b\xc4\x71\xb9\x13\x15\xac\x64\x57\xfb\x82\x69\xd9\x82\xf5\x2a\x52\x93\xc9\x0f\x9a\x9e\xe5\x3d\xee\x5a\xb8\x10\x4b\x63\x6a\x86\x93\xd3\xf1\xb5\xd4\x48\x80\x0e\x71\xf4\x26\xbc\x26\x8c\x8d\xab\x09\x29\xe8\x64\x0b\xa4\x38\xff\xe8\x84\xdb\x20\xde\x7e\xa3\x9c\x28\x4d\xd3\x18\x4d\x70\x13\x2a\xbb\x22\x43\xa4\x35\xd5\x3c\xe3\x85\xfb\xb1\xb9\xac\xef\xe4\x0e\x81\xce\x6b\x53\x4a\x0f\x4e\x34\x5d\xed\x55\x5b\x83\xb0\xd0\xd6\xaa\x94\x4e\x98\xd5\xde\xe1\x2a\xa6\x98\x93\x0d\x04\x4c\x90\x78\xe2\x24\x50\x49\x9c\x11\xdf\x9d\x9d\xee\xe1\x95\x9f\xd4\x83\xc8\xbd\x85\x2d\xd8\x5f\x04\x37\x7c\x22\xe1\x35\x67\xbe\xc9\xd0\x3b\xfe\xdb\xdf\x9d\xb7\x4a\xaf\x8f\xf7\x91\xfc\x16\x56\x4a\x83\x13\x52\x38\xf0\x88\xcf\xc1\xe2\xc0\xa2\x10\x70\x3c\x58\x20\x3e\x75\xd4\x3f\x13\x6b\x92\x90\x13\x04\x5b\xef\x84\xdf\x18\x07\xa2\x91\xbe\xdc\xa0\x7c\xe0\xd2\x04\x5d\x38\xa8\xa1\xf4\xc6\xce\x02\xd6\x16\x6a\x52\x1d\xb8\x15\x7c\x6a\xad\xb6\xa0\x09\x39\xd7\xca\x12\x4e\x59\xe6\xfc\x06\x26\x48\xe1\x36\xa6\xab\x2b\x94\x85\x74\xc2\x55\x00\x8b\x02\x7f\x2f\xeb\x3c\xd7\xcd\x6a\xe3\xef\xd9\x70\xdc\xee\xb2\x53\x75\x05\x76\xa0\xc8\xbd\xed\xfe\x35\x7a\xfc\x66\x03\x71\x01\xd6\x2e\x42\x39\x56\xae\x5a\xd6\xf5\x2e\x29\xa6\x0a\x3c\xd8\x46\x69\xa0\xbd\x2e\xc1\x79\x81\x5a\xdf\xc3\x3a\x08\xae\x21\x28\xa8\x84\xd1\x22\xac\xd4\xba\xb3\x20\xae\xfa\xad\xff\xa0\xbc\x7b\x06\xea\x72\x0b\x76\x69\x1c\x3c\x88\xc8\x77\xbc\x72\x78\x5c\xd4\x66\xbd\x0e\xb6\x83\xe9\x50\x9a\xa6\x35\x1a\xb4\x0f\x86\xc6\x75\x6d\x6b\xac\x17\xca\x8b\x13\x28\xd6\x45\x40\xe1\x07\xa9\xd5\xad\x09\xef\xb4\xa6\x3a\xed\x8f\xbd\x44\x7e\x7c\xba\x43\x7f\x8d\xe0\xc3\x91\x97\x43\xaa\xf6\xe7\xb7\x05\xeb\x94\xd1\xa4\x58\x2f\x5b\x59\xa6\xf7\x7e\x20\xfc\x6d\xa7\xbd\x6a\x80\x0e\x9d\xc4\x01\x2a\x51\xab\xa5\x95\x56\x81\x9b\x09\x86\x1c\x98\x3c\x5a\xcf\x67\xc0\x03\x61\x5b\xf3\xb0\xfb\x0c\x21\xd6\x29\xfb\x28\x21\x41\xe9\xbc\xe6\xb7\xf3\x48\x94\xf0\x36\xa2\xd8\x39\x10\x2b\x63\xc7\x56\xa0\x10\x57\x5e\x98\x2d\x58\xab\x2a\x70\x01\x21\x7c\x26\xda\xa6\x08\x02\xf5\x54\xb0\x63\x99\x44\x89\xeb\xc0\x19\x19\xcf\x18\xed\xa5\xd2\x4f\xa9\x2c\x5e\xc7\x25\x1e\xe2\x9d\xfe\x90\xa3\x59\xce\xb1\x13\xe2\x6e\x03\x16\xf6\x0c\xe3\x9d\xaa\x6b\x3c\x80\xe2\xca\x0b\x59\x3b\x83\x60\xb6\x48\x9e\x04\x99\x9f\x43\x72\xbe\x07\xbb\x55\x25\x6a\x72\xe7\x4c\xa9\x92\x02\x0d\x0a\x39\x2d\xf7\x0c\x58\x4e\x76\xde\x3c\x88\xc5\xd1\x51\xce\xa4\xf0\x6f\x1d\x38\x3f\x2f\xdb\xee\x40\x06\x6d\x94\x56\x4d\xd7\x08\xd9\x98\x4e\x93\xe1\x7b\x7d\xfd\x67\x82\xa3\x2c\xcb\xe5\x18\x76\x03\x8d\xb1\xbb\xcf\x06\xcf\xaf\x4f\xae\x50\xab\x46\x3d\x0a\x77\xf9\xf1\x40\xdc\x19\xf2\xe3\x30\xdf\x03\x7e\x0f\xe6\xf0\xb1\x3d\xc4\x3e\x4c\x72\xcc\x79\x64\x17\x02\x42\x0a\x56\x49\x71\x9b\x24\x31\x72\xf4\xd0\xd9\xb1\x3e\x5b\x4d\x69\x3f\xb1\x89\x5c\xee\xa4\xa8\xd4\x6a\x05\x16\xb4\xa7\x97\x03\xc6\x14\xb6\x0c\xc4\xa2\xf7\x81\x17\x5f\xbf\xfc\xfa\xe5\xe2\x74\xbc\xec\x5c\x47\xa7\xf9\x01\x1a\xde\xbb\x3c\x02\x49\xda\xef\x5e\x84\x82\x7c\xf4\x68\x6d\xbc\x6f\x87\x68\x39\x26\xd0\xfc\xd1\x54\xe9\x34\x7a\x38\x1c\xa1\x06\x20\x8c\xcc\x90\x24\x6c\xa3\xdd\xc0\x17\x8f\xe8\xe6\xe4\xfa\x34\x56\x9f\x45\xb4\x4f\x62\x47\xc4\x9b\x44\x31\x9a\x0b\x8a\x9f\xf7\x51\xdc\x27\xdd\xa1\x78\x91\x40\x28\x9d\xad\x88\x6f\xa2\xad\x3a\x76\xf4\x63\x25\x16\x99\xc6\x5e\x8c\xc2\xe1\xc4\x40\xd6\x2c\xc1\xcd\x0f\xd5\xb0\xd7\xf4\x38\x7b\x55\xd5\x58\x5c\x18\x56\x0c\x7b\xa6\x18\x98\x82\xb8\xc5\xe9\x78\xfd\x79\x2b\xfd\xe6\x80\x4d\x5f\x4b\xbf\x41\x52\xca\xb2\x04\x97\x16\x22\x10\xe2\x24\x99\xe3\xc5\xf9\x06\x64\xed\x37\x8b\xd3\x42\xbc\x35\x1e\xa2\x87\x9f\x0e\x23\x6a\x76\xe4\x20\x74\x7b\x82\xd3\x07\x95\xd1\xe2\xdf\x3a\x69\x6f\x3b\x37\xf0\x99\x1c\x78\x8f\x5e\xa3\xf2\xc1\xee\x81\xc3\x75\xd8\xd4\x07\x98\xb9\x71\x5c\x49\x55\x53\x50\x62\x84\xf3\xd2\xfa\xa1\xde\xdb\x82\x06\xe7\xe6\x18\x11\x29\x59\xcf\x2b\xa8\xe5\x6e\x28\x23\xbf\xf9\x62\x22\xaa\xee\x9a\x25\x58\x54\x7a\x0e\x4a\xa3\x2b\x27\xe4\xca\x83\x1d\x51\x7a\x23\x1d\x2f\x89\x62\x0b\x2b\x63\x21\x2d\xd8\xef\x1d\xcf\x08\x4d\x1e\x63\xe0\xc7\x7a\x39\xe0\x87\xbb\x37\x9d\xff\x7c\xcc\x58\x4c\xfa\x03\x42\x80\x4e\x98\x0e\xad\x6f\xdb\xd6\xe8\x70\xb0\x07\x10\x30\x8b\x2b\xf3\xe3\x93\x38\xb5\x60\x95\xa9\x1e\x46\xe9\x4f\xe6\x4e\x98\x95\x07\xf2\xea\x5a\xb0\xe8\x5f\xf5\x98\x8c\xd7\x3f\x64\x65\xd7\x11\xcb\xcd\xfd\xc6\x82\xdb\x98\xfa\x00\x24\xde\x04\x43\x5b\x1a\xed\xa0\xec\x28\x06\x0d\x60\xc0\xf5\x9a\x96\x69\x63\x38\xc0\xd4\x4e\x55\x60\xa1\x8a\x0f\xae\xba\x3a\x50\x87\x69\xba\x91\x5b\x64\x2c\x64\x30\xa8\x8a\xc7\x6f\x03\x5f\xec\x2c\xfc\xdc\x6d\x04\x30\x0f\xee\x82\xf1\x9c\xda\x01\xed\x0f\xaa\xc7\x6c\xc2\x82\xac\xd4\x2f\x2a\x3a\x69\xc5\x03\x65\xa7\xc7\xf0\x17\x17\x9e\xb4\xf4\x7d\x74\x7b\x22\xf1\x39\x68\xed\xe7\x20\x40\x07\x6d\xe4\xd7\x2f\x42\x7b\xdb\x48\x61\xa7\xa5\xe0\xe6\x29\xea\x0c\xc7\x14\x73\x5a\xb4\xc8\x93\xe1\x66\xe7\xbc\x69\xd4\x3f\x63\x5a\x0a\xb7\x60\x3a\xe2\x7b\x66\x4a\x55\x32\x19\x55\x03\xf6\x1c\xf1\x0c\xc9\xd4\xcc\xac\xba\xe2\xaf\x1b\x55\x83\xd0\xc6\x36\x94\xf3\x92\x7a\x60\x75\x43\x14\xe0\x84\x14\xad\xc1\x55\x09\xe2\x12\x84\xe4\x6c\x79\xd7\x72\x02\x84\xcb\x07\x33\xe1\x4c\x03\x69\x75\xe1\xa5\xbb\x75\x33\x24\xea\x46\x48\x27\x96\xd2\x97\x1b\xf1\xc1\x2c\xdd\x2c\xc0\xcd\x7c\x4d\x59\x7a\xb5\xa5\x2c\x8a\xf4\xc2\xb5\x50\xaa\x95\x2a\xc5\xc6\x74\x36\xc5\xd0\x95\xdc\x89\x58\x03\x91\xfd\x2a\xa4\xb1\x28\x72\x51\xba\xf3\xe0\x8a\x3f\x18\x76\xa7\x69\xdd\x80\x03\xe9\xa5\x21\x29\x1b\xe9\xc1\x2a\x59\x47\x0a\xe6\xfb\x96\xb8\xe3\xfe\xcc\xe8\x14\xbe\x37\xcb\x17\xec\x95\x38\x0f\xb2\xc2\x15\x25\x6a\x37\x5d\x49\x5b\x89\x0a\xda\xda\xec\x1a\xd0\x7e\xa6\xb4\x30\x96\x92\x8a\x46\x38\xb9\x45\xe6\x71\xa6\xb3\x18\xad\xdf\x6d\x40\x8f\x17\x63\xde\x36\xc0\x7e\x93\x06\x3e\x5d\xf2\x6c\x91\xb1\xa1\x2a\xb2\xc4\x47\x4c\xa9\xa1\x52\x15\x2b\x6b\x58\x87\xac\x4c\x5d\x9b\x3b\x64\xe0\x3e\xf7\xc6\x54\xb5\x20\x60\x2b\xeb\x8e\x28\x1b\x83\x8e\x44\x87\x0b\xb1\x20\xee\x58\xcc\xc4\x02\x7f\x8b\xff\xa3\xb3\xe6\xff\xb9\x28\x90\xf9\x6c\x57\x07\x69\xea\x5c\x74\x1e\xa7\xe8\x22\x64\x48\x67\x24\x44\x2e\xe6\x11\xf4\x05\x6f\x9a\x8f\xcb\x45\x26\xbe\xb3\xca\x7b\xe0\xbd\x4b\xc7\x28\xc1\xc7\xd6\x82\xa3\xa4\x5b\x21\xbe\x2b\xd6\x45\x00\x71\xe1\x55\x79\xfb\x7b\x06\xf0\xcd\x6f\x5f\xbe\x7c\xf9\x72\x51\xcc\xf7\x10\xbe\x48\xc4\x25\xa0\x23\x88\x3d\x81\x83\x75\x4a\xb6\xe1\x24\xe8\x8a\xa3\xf0\x8b\x23\xd1\x4a\x0e\x84\x1c\x78\x3c\x89\x97\xa7\x9c\xb1\x24\x8c\x78\xd9\x0b\x2f\x97\xbf\x8f\x75\x8a\x6f\x5e\x9e\x7f\xf1\x1f\xff\x57\x5b\x77\xee\x7f\x9f\x4d\xfd\xf7\xfb\x05\x72\x6d\x40\xf3\xc2\x5b\xb5\x5e\x83\xfd\x3d\x82\xf9\xe6\x25\x3f\xf1\xf2\xfc\x8b\x7b\xdf\x2f\x8e\x7f\xfd\x59\x9c\x48\x8d\x03\xc3\xac\xc8\x38\xf1\xb5\xa4\xb2\xef\x36\xa6\x1e\x67\x0a\x57\x59\xb9\xcb\x74\x3e\xe5\x0b\x11\xbb\x0a\xca\x5a\x5a\xa8\x48\xc4\x77\xa2\xe9\x9c\x47\x65\x0e\xa9\xf2\x35\x5e\x42\xb9\x06\xca\x8d\xd4\xca\x35\x48\x89\x3b\x63\x6f\x45\x69\xac\x85\xd2\xd7\x83\x1d\x8d\x44\xe9\xfe\x3d\x1d\x5f\x12\x89\xa4\x70\xd0\x4a\x1b\xb2\xc1\xce\x47\xd5\xc5\x99\xe3\x71\x62\x3c\x93\xf5\xa4\xcc\xab\x14\xfb\x04\x25\x12\x08\xd3\x23\x9b\x74\x48\xda\x18\x06\xed\xcc\x56\x18\x3f\x7e\x4c\x05\x8c\xe5\x2e\x93\xd5\xe2\x32\xd6\xd7\xa2\x72\x4d\x6b\x5a\x84\xd0\x2b\x60\x5c\x11\x24\x86\xe3\xfc\x24\x64\x29\xfd\x20\x98\x01\xa9\x00\x31\x48\x7a\xff\x14\xeb\x5b\x12\x95\x79\xfc\x5b\xbe\x58\xbf\xd6\x89\xf2\xc7\xc7\x68\x54\xc1\x81\xc6\xf0\x2f\x4b\x05\x2f\x8c\x5d\x17\x92\x52\xef\x05\x65\x98\x8b\xdb\x8b\x51\xa6\x79\x4e\x4a\x20\x24\xde\x77\xa7\xc5\xfb\x18\x75\x8e\x4f\x8f\x99\xa5\xec\xac\x05\xed\xeb\xdd\x45\xaf\x3e\x02\x7e\x68\xc6\x92\xee\x3b\xce\xd8\x60\x25\xeb\x7a\x29\xcb\xdb\x07\x45\xec\xcf\x0e\x06\x19\x6c\x3e\x73\xd5\xb4\x35\xa0\x59\x60\xc3\x12\xf8\x81\x57\x17\xa0\xab\xd6\x28\xed\xc5\x49\x5c\xfa\x34\x1d\x7f\x32\x32\xde\xee\x42\xe0\x7b\x8f\xc5\x92\x6e\x42\x2d\x0f\xb9\x59\xf3\xee\xcb\xdd\xbc\x35\xb5\x2a\x0f\xc9\x10\x1e\xbf\x0f\x1c\xe0\xc4\xc6\xdc\x91\x2f\x64\x41\xfa\x1e\x98\x0f\x46\x2a\x16\x4a\xa4\xc0\x65\xff\x22\x6b\x55\x09\x34\x3b\xb9\xa8\x5e\xcc\xc5\x11\xb5\x4e\x1c\x5d\x08\xc9\x2d\x14\x01\x4f\xf2\xb2\x6c\xa7\x33\xb8\xf5\xee\x3f\xcd\xc5\xd1\x1f\x8c\x5d\xaa\xea\x28\x25\x3b\x4e\x2f\x90\xf3\x96\xaa\x8a\x60\x33\x44\x6c\xa7\xd1\xd7\xb8\x55\x6d\x8b\xe4\xd2\xf0\x91\x7e\x27\xd4\x0a\xb9\x0b\x5d\x23\x4a\x40\x60\x4c\xa2\x8f\x8f\xbd\x58\x29\xad\xdc\x06\x2a\xb1\x03\x8f\x6b\xbd\x83\xb6\x96\x25\x1c\x5d\x44\xd0\x52\x97\x50\xbb\x9e\x67\x52\x93\xc4\x07\x34\x78\x54\xf6\xa1\x37\x1c\xe7\x30\xc8\x29\xd1\x70\x27\x8c\x86\xe3\xc7\xa6\xb7\x2f\x3b\x6f\x1a\xe9\x55\x49\x72\xcb\xbe\xc4\x94\x53\x12\xd5\x26\xe9\x00\x59\xd7\x41\x1f\x22\x79\x41\xf9\x4d\xca\x23\x92\x7f\x40\x4e\x39\xba\x08\x99\xb3\x84\x5e\x70\xd7\x80\x15\x27\x46\xd7\xbb\x7b\xa5\x80\x24\x26\xa5\x71\x22\x63\x1a\x8b\xe0\xa4\x73\xe8\x70\xf7\xd0\x80\xcc\x75\xa5\x50\x8d\x2e\x48\x9d\xec\x3d\x74\x5a\x50\x1a\x2d\x26\x96\x49\x05\x46\xee\xa8\xeb\x7d\x14\xdd\x48\x8f\xf3\x03\x84\x62\xef\x0c\x07\x0b\x8f\x6e\xa3\x8b\xbe\xb8\xc8\x9a\x08\x22\x66\xaf\x9a\xc5\xe4\x2b\x8b\x97\xe7\xaf\xc4\x19\xff\x5b\xcc\xee\xc8\x19\x5e\xfc\xe6\xcb\x86\x6d\xf6\x97\x2f\xdd\x22\xd4\xf1\xb2\xea\x64\x05\x2d\xe8\x0a\x74\xa9\x88\xbd\x9f\xa8\xd8\xf4\x6d\xb6\xca\xbd\xe5\x69\x39\xe0\x1d\x59\x55\x31\xcf\x16\xd8\x2c\x03\x93\x9a\x29\x46\xa5\xf9\x58\xae\x47\x98\x56\xdc\x49\xb2\x50\x24\x92\xa3\xfa\x91\xf8\xdb\xdf\x73\x32\xd4\x66\xf7\x94\xf5\xb6\xb8\xc2\x74\xfc\x03\x1f\xdb\x5a\x95\x0a\x25\x93\xfb\x13\x68\x07\xb7\x4a\x93\xd6\xdc\xa8\x35\x67\x3f\x6b\xd8\x42\x9d\x5c\x70\xda\x2a\x25\x1c\xa7\x85\xec\x19\xd4\xcb\x70\x87\x07\xe8\xee\xbe\x4b\x6d\x9a\x50\x15\x38\x12\xc3\x3e\x70\x61\xda\x2d\xc1\xdf\x01\x68\xb1\xe8\xff\xb0\x88\x7d\x1f\x6c\xd1\x3f\x98\x25\x8b\xc7\x2d\x1f\xe4\x3c\xa4\xed\x17\xac\x96\x4a\x34\x11\xb1\x7f\xa4\x0f\x7d\xd0\x65\x88\x1a\x74\x32\xc5\x5b\x8c\x38\x0b\x57\x7e\x52\xf1\x8a\xdb\x4e\xc2\x65\xc1\xb5\x46\x3b\xea\x48\x42\x74\xd7\xa0\xc1\xf6\x7b\xc9\x0c\xec\x00\x43\xc1\xf2\x43\x5c\xd5\xc8\x5b\x54\x9a\x16\x3e\x55\xdc\x8d\xc5\xec\xb2\xee\x9c\xdf\xab\xcf\xe6\xf2\x05\x7a\xab\xac\xd1\x4f\x4b\x86\x6c\x91\x9e\x0e\x5d\xcc\x12\x04\x4d\xe3\x8d\x50\xfa\x03\x32\x4e\x0a\x77\x87\xc8\x09\xb1\x95\x56\x21\x77\xbb\xb8\xbf\x7c\xef\x29\x21\x38\x8b\xa9\x80\xc5\xdb\xcb\x37\xdf\xbd\xbf\xbe\x7c\xfd\x1d\x1a\x9f\xeb\x9f\xbe\xfd\x07\xfe\x82\xed\x8f\x41\x3b\xf6\x1c\xfa\x65\xd2\xb6\xe6\x0d\x78\x79\x48\x09\x3b\xbe\xb9\x2e\x9f\x28\x65\x84\x47\xfa\xc7\xd7\xe2\x86\x4e\x72\x2d\xed\x52\xae\x61\x5e\x9a\x1a\xa5\xde\xb1\xc3\x90\x04\x32\x35\x81\x6a\x23\x6a\xa3\xd7\x60\x85\x86\x12\x9c\x93\xa1\x7a\xdc\xb5\x66\x98\x0d\xea\xda\x4a\x62\x24\xf1\xeb\x3f\x9a\x4a\xb9\xd2\x6c\xc1\xee\xe6\x25\x86\x0f\x19\x42\xc5\x79\x7b\xbb\x3e\x67\xe8\xe9\xa9\xd7\xf8\xd0\xcd\xae\x85\x7d\x54\xbf\x8d\xcf\x88\xb2\x56\x28\x25\x04\x30\x44\x6d\xb8\x81\x99\x60\xcf\x0b\xbd\x1f\x6e\xf3\x41\x96\xae\x94\xbb\x65\x25\xc9\xf5\xf4\xc5\x5e\x81\x37\xfc\xfe\x34\x31\x85\xd2\x6b\xcb\x79\xf1\x47\x71\xc6\xde\xf9\x5f\x31\x9c\x4f\x1a\x4d\x13\xe2\x94\x58\x6c\xed\x3b\x48\xc8\x8b\x7d\x11\xc3\xaf\xec\xe4\x43\x12\xd4\x74\xde\xa9\x0a\x30\x0c\xad\xab\xe8\xf2\x66\x5a\x31\xac\xcc\x7e\x5e\xe0\x05\xb1\xdc\x05\xa2\xf2\xbe\xd1\x44\x50\x33\xab\x8c\x15\x7f\xf2\x16\xab\x8a\xf1\x1b\xab\x8e\x13\xbf\xb1\xa6\x5b\x73\xda\x7e\x11\x0d\x0d\xe3\x88\xfb\x3b\x7d\x06\xcc\xb8\x31\xce\x1f\x12\x6c\x9d\x9d\xbd\x0b\xbe\xf1\xd9\x59\x31\x2c\x92\xe3\xee\x11\xcc\xb8\x7f\x20\xf0\x4c\xf1\xe8\x80\xe3\x66\xca\x6f\xa4\xe4\x2f\x33\x4f\x3a\xa6\xf1\x81\x74\x8e\xb2\xc1\x7f\xba\xb9\xb9\x8e\x3d\x02\x31\x88\x8d\x8e\x7b\x6f\xc8\x95\xf3\xca\x3c\xa1\xaa\xbb\x42\xf8\x81\xd1\x65\xde\x95\xbf\xdf\x87\x15\x7b\xf4\x02\x8f\x5d\x05\xcc\x44\x12\x83\x06\xdc\x26\xd9\x27\x64\xf3\x52\xda\x60\xf6\x28\xf8\x42\xcb\xd4\xf9\xa5\xe9\x74\x25\xae\xae\x85\x95\x7a\xfd\x2c\x54\x21\xd1\xe5\x00\xf6\x7b\x1d\xa9\x86\xc7\x7b\x42\xc9\xac\x79\x4a\x66\x9d\xa6\x6c\xd6\xeb\xab\x6f\xdf\x09\xd7\x2d\x35\xa4\xf6\xce\xd4\xd0\x1b\xb0\x58\x32\xc7\xd8\x12\xda\x2c\xeb\xcc\x67\xd5\x5a\xf3\x71\x27\x4e\x16\xaf\x5e\x16\xf4\xef\xfc\xeb\xd9\xab\xaf\xbe\x28\x5e\xfd\x96\x3e\xbc\xfa\x62\xf6\xea\x77\xf8\xe9\x6b\xfe\xf8\xdb\xa8\x36\xfb\x3e\x8b\x41\x5f\x07\x1f\xcf\x83\x34\xfe\x83\x09\x06\x0f\x38\x29\x41\xce\x5d\xe8\x27\x5f\x84\xa3\x2e\x88\x57\x0b\x65\xce\x19\xe8\xa2\x10\xff\x35\x2d\x9a\x25\xa5\xb8\x21\xba\xcf\x0e\x2f\xd0\x1d\x5b\x60\x4c\x95\x39\xd2\xc8\x2c\xd4\x04\x01\x1e\xff\x12\xf8\xb9\x6f\x71\x8a\xf8\x7f\x30\xb5\xb9\x55\xf2\x09\x25\xe4\x7b\x5e\x21\xca\x48\xc8\xbb\xb9\x61\xaf\x32\x93\x26\x3e\xfa\xbd\xdc\x4a\x21\xd7\xa0\x7d\xf1\x1e\xd8\x22\x6e\xbc\x6f\xdd\xc5\xf9\x79\xc0\xb7\x30\x76\x7d\x6e\x81\x3a\x9d\x4a\x38\xdf\xf8\xa6\x3e\xa7\x17\x5c\x81\x3f\xff\xfa\x65\xa2\x94\xf3\x12\xec\x21\x4a\x19\x69\x78\xfd\xdd\x1b\x01\xba\x34\x68\xa2\x5e\x5f\x0a\x7c\x53\xad\x54\x19\xfa\x52\x54\x0d\xa2\x95\x7e\x33\x4b\xf8\x6e\xc1\xaa\x55\xf4\x17\x62\x36\x29\xbd\x04\x6e\x26\x5b\x9a\xd9\xc0\x9d\x50\xc4\xb4\x68\xad\xf1\xa6\x34\x35\x65\x4e\xa8\x7f\xc9\x85\x5c\x4c\xe7\x60\xee\x5c\x3d\x67\x60\x73\xd9\xf9\x0d\x68\x1f\x16\x8f\xd2\x81\x2f\x11\x1b\xf6\xde\xc5\xf9\x56\xda\x73\xdb\xe9\x73\x07\xa5\x05\xef\xce\xfb\x4e\x3b\xe4\xf1\xa0\xf4\x64\x59\x9a\x4e\xfb\xf8\x71\x5e\xca\xa2\xb4\x3e\x82\x45\x29\x49\xcc\x35\x90\xbb\x80\x4d\x6b\x95\x2e\x55\x2b\xeb\x8c\x90\xf7\x4d\x1f\xdc\x50\x49\x36\xbc\x73\xe2\x4e\x43\x45\x9e\x72\xf6\xcb\x38\x45\xa0\xb4\x90\xc9\xd7\xea\xa9\x46\x99\x8e\xa4\xca\x44\x6c\x57\x0a\xea\x3c\xf2\x6e\xb4\x45\xbf\x04\x89\xf9\xf9\xeb\xb8\x9f\x6f\x4a\xfd\x8d\xdb\x39\x0f\xcd\x45\x23\x1d\x4d\x68\xa1\xae\xa3\xd2\x9a\xfe\x66\x23\xef\xbc\x32\x73\xa3\x6b\xa5\xa1\xe0\x4f\x85\xdb\x96\x11\x3e\x61\x52\xea\x6f\x56\x88\x0d\x1a\x52\x53\x43\x81\x1f\xe8\xa1\x7b\x8e\xa2\xf7\x74\x0f\x95\xae\x1f\x95\xf3\xc0\x5d\xc4\x54\x56\x29\xa5\xf3\xb1\xed\xd5\xdd\xdb\x57\x06\x1f\x3d\xe8\x0a\xaa\x48\xaa\x72\x03\x07\xe4\xc5\xdf\x60\xc8\xe8\x43\x2b\xdf\xfe\xb9\x86\x28\xca\xf5\xa7\xbe\xaa\xe5\x3a\x86\x91\x71\xc9\x40\xa6\x5b\xd8\x89\xce\xc9\x35\x7a\xaf\x64\x97\x7f\x89\x83\x66\x0d\xff\xe9\x23\x38\xd0\xbf\x43\xee\xff\x13\xfa\x70\xb2\xaa\x6c\xe0\xdd\xbe\x25\x25\x72\x30\xe9\xd1\x34\x11\xa4\x34\x6a\x14\x2a\x81\x2d\x8e\xfe\xe7\xd9\xd1\xa2\xcf\xc2\x2e\x8e\x82\x09\x3d\xa2\x9d\x92\xf0\xcc\xa2\x5f\x0f\xd6\xd1\xcb\x9c\xff\xa1\xf0\x45\x83\xa7\xf2\x11\x99\xe6\x95\x2c\xfb\x39\xb0\x98\xdc\x39\x3a\x3b\x1a\x35\xc2\x4a\xe7\xee\x8c\x3d\x24\xdb\x44\xa2\x1d\x1e\x67\x45\x88\xf4\x1a\x92\x78\x26\xc6\x87\x45\x4e\x7d\xe7\xc0\xa6\x7d\xb5\x3c\xb8\x46\xe6\xf5\xd1\xad\xc0\x13\x8a\x80\x5b\x46\xb3\xf6\xd5\xaf\xbe\xfa\x7a\xb4\xc9\xc0\x2f\x87\x6e\x32\x3c\x1e\x66\x1b\xfa\xe8\x8f\xba\x4e\xe9\x60\x02\xcf\x0d\x1b\x52\x1d\x71\x50\xd8\x66\xcf\x47\x19\x22\x48\x87\x03\x91\xa0\x34\x6d\x1f\x82\x4e\xd0\x7a\x08\xf7\xd3\x6c\xff\xa0\xf4\xfe\x75\x03\xb4\xbf\x7d\xc9\x75\xd9\xdc\xda\x27\xb0\xd8\x63\xb1\x87\x44\x89\xcf\xff\xd0\x69\xb6\xcb\xe4\x95\xca\xaa\x52\x54\x06\xab\x13\x07\x04\x50\xe8\xcd\x57\x34\xf5\x56\x29\xfd\x48\x47\xe6\x3f\xd0\xcf\xf3\x0f\xdb\x66\xce\xbe\xd2\xdf\xbe\xff\xcb\x9b\xa8\xb0\x49\x4e\x87\x83\x19\x61\xc9\x3e\x85\xf7\x61\xdb\x3c\x5d\xea\xee\xfb\xbf\xbc\x19\xa5\xec\xfc\x38\x64\xa4\x47\xd0\x47\xb7\x9d\xde\x1b\xc4\x7c\x06\xb1\x4b\x05\xcb\x6e\xfd\x70\xf1\x2c\x79\xb5\x16\x1a\xe3\x81\x5f\x5b\x87\x86\xa4\x90\xe7\x0a\xbf\x44\x4e\x66\xac\xa5\xf7\xb2\xdc\x40\x6a\x6a\x12\x91\x62\x33\x01\xc5\xba\x98\x71\xcb\x0b\x0f\x03\xac\x8c\xbd\x93\xb6\x62\x79\x1c\x20\x37\x77\x9d\x6b\x41\x3f\x4c\xab\xf7\xfc\x1c\x9f\x82\x97\x76\x0d\x9e\x8e\x47\x35\x0d\x54\x4a\x7a\xa8\x77\xb1\x45\xd2\xa7\x36\xf4\x5a\x3a\x87\xa7\x5b\x1b\xc9\x36\xb0\x57\x5a\x0a\xed\x2f\x06\x69\x07\xac\x8d\x3e\x8a\x77\xa1\x37\x93\x5e\x09\x67\x86\xd6\x82\x3a\x89\x22\xb3\xa8\x71\x9b\x79\x6d\xd6\x6e\x5a\x8a\x4f\xf7\x48\x11\xec\xda\x21\x3a\xcc\x4a\xed\x48\x33\x47\x5b\x28\x7d\xb4\x85\x86\x84\x3a\x38\x28\x34\xea\x0b\x77\xf5\x4e\xd4\xb2\xd3\x74\x5c\x88\xe6\x18\xa1\xb3\x8b\x2f\x5f\xbe\xfc\x72\x80\xd2\xe7\x6a\x12\x04\x1f\xdf\x4d\x15\x97\x61\x9d\xe3\x90\x70\x2d\x09\xf1\x9e\xd8\x8e\x82\xc1\x7b\xb2\x17\x51\x83\x91\xa9\x0c\xa5\x93\xa9\xec\x1c\xaa\xb8\x08\x35\x66\x33\xfa\xfe\x81\xac\x47\x2d\x4b\xd5\xf5\xe5\x8f\xe2\x5d\x06\x39\x6f\x0d\xcc\xc1\xf6\xe3\x66\x55\xe5\x28\x73\x34\x77\xa5\xa4\x86\xfc\x13\xea\xe6\xe7\x0f\x73\x6f\xe6\xff\x04\x6b\x4e\xc5\x0a\xa4\xc7\xc8\x92\x2b\x47\xcb\xce\x87\xe1\xe2\xf8\x7b\xd4\x01\x54\x81\x6e\x40\xe2\xea\xab\xae\xee\x5d\x82\x50\xd4\xee\x1c\x84\x4c\xd3\x54\x8e\xe9\x57\xaf\xbc\x90\x4a\x91\x2e\x24\xc9\x8f\x4b\xc2\xf8\x8c\x57\x32\x50\x41\x29\xa4\x71\x0b\xae\x6f\x7b\x43\xb9\x86\xc5\xa6\x95\x45\xf6\x70\x11\x38\xb7\xa8\x60\x9b\xbb\x8e\xb7\xf7\x3c\x96\x2f\x76\x5a\xbc\x43\xe3\x18\xa3\xac\x88\x4e\x65\xca\x2e\xb5\xb4\x64\xc1\x62\x63\xa8\x8b\x1b\x05\x23\x59\x98\x29\x6a\x34\xe0\x6d\x6c\x4e\xfd\xb9\xe4\x60\x58\x9f\xa2\x47\xd6\xf5\x92\x52\x49\x5c\x03\xb7\x62\x51\xb6\xdd\x22\x7c\x7c\xe4\x9e\xd3\x6e\x53\x15\xf3\xc1\x3d\xb3\xca\x7f\xc8\x85\x7d\x0f\x41\x4f\x93\x3e\xa0\x36\xa6\xb4\x81\x50\xc9\x36\x96\xe6\xff\x5a\xb0\x25\xa2\xb3\x26\x3f\x1e\x4d\x0b\xcf\x60\x67\xb6\x6c\x9f\x4c\xa7\x7d\x6f\xd7\xb5\xa9\x0e\xdc\x68\x80\x78\xdf\xe1\x36\x4a\x93\x3e\x80\x43\x5c\xf4\x38\x2c\xa9\x53\x9b\xfe\x75\xba\x93\xa4\xf7\x28\x63\xa9\x18\x6d\xb7\xde\x51\x13\x73\x86\xcc\xc4\x34\xf1\xb1\x13\x67\x67\xa8\x7c\xce\xce\xb2\x74\xe1\x2c\x2a\x18\x82\xbf\x77\x41\x86\x23\xcd\x95\xc2\xcb\xca\xdc\x51\x7f\x3e\x82\x61\x75\xa4\x8d\xcf\x9c\xdb\x5e\x39\x57\xd9\xc4\x24\xe2\x36\x49\xcb\x04\x75\x8a\x75\x3e\x49\x4b\xf9\xf1\x30\x5a\x5e\x6a\xd1\xb5\x2d\x58\xc1\x39\xe9\x64\x2e\x27\xc8\x1a\x5c\x9e\x48\x53\xa5\x45\x2b\xad\xac\x6b\xa8\x33\xe9\x1d\xd3\x34\x32\xc4\x46\x3a\x81\xba\x0f\x69\x53\xca\x36\xa4\x50\x09\x2e\x33\x5e\x1a\x1a\x43\xa3\x23\xeb\x9a\x5f\x27\x82\xc4\xe3\x3a\x44\x96\xee\x93\xa2\x87\x7d\xc0\x03\x1b\xa8\xc6\x76\x32\x36\x52\xc5\x34\x9d\xd1\x1c\x48\x38\xb1\x31\x75\x75\x71\x36\x18\x3a\x27\x3f\x3b\x75\x03\x04\x48\xc1\xf0\x9f\x91\x99\xe8\xdb\xb1\xc4\xbd\xfd\x58\x64\xd4\x58\xf5\xa4\x1e\xaa\x03\x3b\xab\x62\xfc\xb1\xdf\x5f\x35\xf6\x57\xfe\x35\x7e\x4a\xf0\x4f\x86\xf4\x0d\x49\x27\x17\xfd\x37\x1e\x74\x8f\xaf\xa4\x1a\x33\xe1\x4a\x0d\x5b\xdc\x3e\x40\x7d\xac\x2a\x94\x13\x7b\x6e\xec\x79\x0e\x17\x5e\x75\x75\x9d\x40\x0d\x03\xac\xb0\x7b\x86\x46\x3d\x0a\xdc\x5d\x7b\xf9\xe6\xbb\x1f\xff\xf1\xc3\xdb\xcb\x9b\xab\xbf\x7c\xf7\x8f\xd7\x3f\xbd\xfd\xc3\xd5\x1f\xff\xfc\xee\xf2\xe6\xea\xa7\xb7\xf8\xc8\xf7\xef\x7f\x7a\x2b\x98\xb5\x8a\xfe\xfa\x87\x7e\x85\xd0\x28\x4a\xa0\xa9\x4d\x03\x43\x58\xf2\x3e\x7c\x44\x67\x88\xc6\x5e\x9c\xc5\xc7\x4e\xc0\x53\x44\x96\xfb\x21\xbd\x3e\xea\x9d\x9c\x11\xff\xa4\x16\x5c\x78\x06\xae\xcd\x80\x1c\x87\xd8\xf1\x21\x42\x81\x1b\xe4\xe0\x0c\x6a\xf0\x7b\xc7\x3d\x3c\xbb\x1c\x81\x8d\xd4\x1a\xea\x79\xce\x67\x0f\x7b\xf9\x3f\x06\x1f\x3f\xbc\x1d\xa2\x66\xe9\x44\xe8\x0d\x33\xab\xe1\xf0\x0b\x9f\x2a\x22\x1f\x02\xa2\x28\xcd\xd4\xd4\x1b\xc1\xf0\xbd\x37\x48\x5e\x62\x15\xe6\xae\x3f\xbf\xbb\x72\x93\x08\x2b\x7d\xfb\xb3\xd1\xad\xc0\x79\xa5\x53\x43\xf1\x53\xe1\x1c\x9d\xee\x5f\x84\xca\x93\xeb\x7e\x06\xb1\xe2\xcb\xff\x12\x6a\xa5\xb0\xe3\x20\x72\x6d\xe1\xb3\x69\x45\xef\xd2\xf3\xae\x6f\xc6\xdc\x6b\x1f\x5b\x82\x70\xdd\x12\x5f\x5f\x92\x20\x21\xe2\xbd\xe1\xe2\xa9\x96\x80\x78\x06\x6f\x1f\x6b\x71\x12\x2e\x66\x91\xfd\x30\xc0\xd2\x9a\x5b\xb0\xfd\x05\x06\xd1\x31\x40\x7b\x75\x14\x94\xd7\xd1\xe9\xc4\x7e\x3f\xe7\x8c\x0e\xda\x6d\x6b\x4d\xd5\x95\x70\xcf\xe9\x7c\xe6\x26\x07\xbb\x58\xa9\xda\x83\x0d\xc7\x36\x8f\x3c\xfb\xa0\x8a\xe5\x69\x7d\x17\x5e\x0f\xd7\x1f\x11\x42\xc3\x2e\x5b\xb1\x01\x59\x81\x15\x47\x25\xcc\x83\x59\xde\x28\xe7\x8d\xdd\x1d\xc5\x7b\x90\xde\x2b\x5d\x06\xc5\x8b\x36\x80\xa6\x96\xc0\x2a\x72\x90\xea\xf0\xfe\xc0\x8b\x83\xc6\x6c\xd9\xf8\x49\xb1\xea\x7c\x76\x59\x51\x0c\xf1\x92\x29\x9e\x65\x08\xf6\x36\x89\x23\xef\xa9\x59\x34\xa1\x1c\x67\x5f\xa2\xaf\x92\x3b\xff\x7e\x23\xb5\x78\x15\xe5\x7a\x58\x4f\x6d\x92\x32\x9e\xa3\x32\x97\x0f\x17\xe5\x23\x05\xa3\x0d\xa0\x93\x7b\xcf\x2a\xa2\xb5\x20\x5e\x16\xaf\xbe\x14\x0c\x4b\x2d\x55\xad\xfc\x4e\xac\xd4\x47\x70\xe2\x24\xc8\x42\x40\x2d\x23\xc7\x90\x18\xee\xf4\xd1\x5e\x64\xb8\xd9\x2a\x39\x3b\x7d\x75\x8d\x92\xcc\xd1\x58\x66\xe6\xb9\xaf\xe5\x73\xd1\xef\x29\x47\x41\xdf\xd0\x0a\xf7\x24\x8c\xc6\x87\x39\x6e\x0e\xa7\x0d\x63\x14\x69\x31\x6c\xcc\xb2\x41\xc3\x2e\xdd\xca\x28\xbd\xae\x99\x6f\xa9\x5f\x38\xf6\xbf\x24\x2f\xf6\x8c\x37\x7b\x96\x8f\x63\x11\x4f\x19\x4d\x15\x02\xd4\x44\x14\x0c\xe8\x92\xee\x91\x3c\x3e\xce\xe7\x8b\x86\xbe\xe4\x1d\x3b\x5b\xd1\xad\x4e\x64\xcc\x1a\x8b\x88\xd3\x69\x29\xce\xcd\x8a\x05\xb2\xe6\xc9\x11\x3f\x7b\x51\x9b\xf2\x96\xce\xc0\x43\x8d\x7b\x6f\x2e\x96\xc6\xbb\xa3\xd3\xa2\x28\x16\xc5\xdb\x9f\x6e\xbe\xbb\xe8\x2f\xaa\x08\xc4\xab\x2a\xc7\x5a\x41\xd2\xe0\x41\xa3\x78\xec\x70\xaa\x03\x2d\xb5\xc9\x71\xad\x5c\x64\xd3\x9d\x2f\x44\x98\x12\x3f\xbf\xb3\x2a\x79\x2f\x8d\x6c\x5d\x98\x0f\x91\x74\xb1\x59\xa4\x80\x05\x74\xac\xa8\x9c\x29\x92\x6e\xea\x6f\x8c\xe9\xb3\x8b\x22\x2d\x46\x22\x97\xd4\xef\x20\x13\xb8\x17\xaf\x3d\x83\x21\xc1\x47\x08\xa1\xcb\xa4\x70\x54\x65\xe1\x11\x2a\xc6\x64\xd0\x0c\x54\xd6\x5d\x05\xf3\x0a\xb9\x40\x7a\xfc\x61\x30\xa7\xf1\x60\x9d\x4b\xf3\x2e\xb8\xfc\x1c\xbd\x71\x1e\x65\xc3\xad\x48\x8f\x11\x9a\x96\xf5\xee\x9f\x21\x1f\x15\x1c\x9a\xd2\x54\xd0\x57\x11\x64\x55\x0d\x87\x2e\xd2\xc0\x0b\x45\x01\x8c\x5b\xef\xa6\x14\x34\x4f\x97\x09\xc1\x62\x8f\xab\x79\x42\xb7\xcf\x7c\x68\xb1\x20\x85\x1b\xfe\x42\xb8\x8e\x7b\xf9\xfa\x4e\xb7\x70\xd1\x63\x8e\xd2\xa0\x41\x33\xa6\xc5\x26\x6f\xb2\x49\x1c\x7d\x80\x93\xff\x56\x36\x90\x5d\x77\xc6\xef\x65\xad\xf1\x19\x67\xa1\x01\x64\x75\x85\xbb\x2c\xc4\xb7\xbc\x72\x76\xb1\xcf\xd1\x7f\xce\x58\x9b\xee\x15\xfa\x2f\x73\x7c\xf6\x68\x70\x05\x87\x5c\x42\x3d\xbf\x85\x43\x46\xd9\x7e\xa4\xbe\xad\x49\x6c\x54\x05\xda\xab\xd5\x8e\xc7\x90\x68\x48\xd9\x68\x1f\x32\x6a\x09\xc9\x80\x5b\x44\x95\x90\xe4\xa9\xc4\x30\xa2\x68\xec\xfa\x3c\x43\x7a\x02\x53\xca\x9c\x1c\x8c\x6b\x96\x67\x79\x2c\xc6\x01\xd7\x21\x71\xa7\x94\x1b\x5d\x6f\xf4\xa2\xaf\x99\x80\x96\xad\x7a\xba\x92\x25\xfe\xf1\xf2\xfa\x4a\x7c\xfb\xfe\xc7\xfb\x47\x9a\xd0\xb8\xf5\x83\x24\x79\x55\xe2\x45\xf2\x4a\x65\x02\x87\x9a\x7c\xdc\x8a\x99\x4f\x52\x98\xbb\x27\xbd\x16\xf0\xa7\xbb\xfe\x4a\x40\xd0\x2e\xa4\xab\x25\xd9\x68\xde\x04\x54\x99\x89\x5d\x42\x6d\x78\x9e\x73\xea\x22\x80\x25\x50\x92\x9f\xdf\x42\x2b\xe2\xad\xd4\x6e\x45\xb9\x16\xad\x8d\x8f\xb5\x19\x5d\x8d\x6e\xc4\xcd\x8f\x35\x76\x6c\x87\xcb\xda\x70\xff\x19\x06\xcf\x20\xc1\xc0\xd9\xf2\x79\xb6\xe3\x03\x43\x8c\x9b\x5e\xe3\xe5\xe4\xe2\x5e\x89\x48\x4a\x3b\xa8\xa5\x86\xb5\x1e\x75\x8f\x6e\xb6\x4c\x38\x85\xfd\x15\x52\xad\x36\x70\xdd\xd3\x31\x60\x04\xdb\xcb\x94\xa4\x20\x24\x7c\x26\x5e\xcc\x7a\x04\xa4\x73\x6a\xad\x47\x57\x7d\xd0\x1e\x7b\x40\x66\xf4\xe7\xe2\x4a\x8b\x52\x86\x94\x58\x7a\x4c\x39\x41\xae\x93\x5e\xcf\x7a\x9b\x4c\xeb\x73\xf9\xe2\x45\xd0\xe6\xcc\xce\x54\x84\xe7\x2c\x58\x84\x50\xdc\x90\xc5\xe5\xa2\x20\x45\x28\xc1\x2b\x63\x65\xb0\xea\x6a\x11\xae\x63\x83\x8f\xde\xf1\xbd\x99\xb1\x04\x6a\xe1\xd8\x09\x6d\xd2\x14\x7d\xb8\x2d\x53\xc8\x30\x6b\x3e\x71\x6b\x66\x8e\x3c\x27\x56\x8d\x1e\x90\x76\x78\x07\x69\xb8\xa3\xcc\xd1\xdc\xfd\x4c\xb8\x10\xa8\xf1\xca\x18\xa8\x35\x4b\x20\x53\xdb\xd7\xcb\x55\x83\xae\xb5\x85\xb5\x72\xde\xee\x9e\xc3\x74\x02\x9f\xcd\x3c\xaf\xa8\x3f\x30\x38\xb0\x77\x9a\x27\xd0\xb4\x7e\x77\xda\xf3\x45\x0a\x2d\x27\x38\xe5\xd1\xfe\xe0\xde\xa8\x42\x05\x1e\xca\xec\xf6\x93\x7c\x86\x4d\xad\x26\xb8\x2c\xe6\x48\x98\x94\x51\x23\x9f\xa8\xde\xb0\xc6\xdf\xe5\xec\x40\x11\x4d\x36\xf6\xdb\x5a\xd3\x80\xdf\x40\xf7\xe8\x11\x9d\xc7\x04\x79\xd7\x69\x95\x38\xc0\x93\xf7\xe5\xf7\x7f\x9d\xc7\xd0\x38\x4b\x53\xb1\x8f\x12\x6f\x8f\xe5\x51\x91\xfd\xfb\xd7\xc3\xdc\xce\x22\xd4\xf4\x17\x68\x4a\xfa\x8f\x6f\x8c\x56\xde\xd8\x45\x6f\x2e\xd8\xf3\x8c\x8d\x34\x4c\xf0\x58\x8d\x67\x8a\xba\xd2\xca\x76\x1c\xd8\xcd\xc6\x91\x5d\x8f\x7b\xf4\xa6\x8b\x9b\xe0\xaa\x70\x75\xd2\xa5\xe9\x96\xad\xb4\x3b\x91\x57\x35\x33\xa7\x92\x8a\x6f\x61\xc2\xb9\x10\x7f\xc5\xcd\xfc\x37\xbe\x5f\x90\x75\x50\x80\xc5\x61\x94\x4d\xf7\x43\x32\x1e\x6f\x54\x69\xcd\x75\xc8\xb8\xbf\xe1\x27\x0b\xc1\x77\x20\x11\x5d\x72\xf1\x0f\x8b\x84\x9b\x45\x64\xd0\x3c\x11\xc7\xa9\x8d\x89\xef\xdf\xfc\x77\x7a\xc0\x7a\xb0\xc5\x5f\x2f\xdf\xbd\xbd\x7a\xfb\xc7\x70\x45\x32\x39\x33\xd9\x0d\x10\x23\x7a\x87\x58\x32\x84\x14\xe9\xde\x25\x4a\x21\x85\xa6\xb5\xb5\xf2\x9b\x6e\x59\x94\xa6\x39\x2f\x8d\x05\xe3\xce\x7b\x96\x9c\x47\x9a\xfe\xed\x3a\x67\x53\x6a\x35\xa4\xdf\xff\x3d\x28\xc5\xb4\x04\x35\xc5\xa9\x98\x27\x58\xa6\xea\x1d\x54\xc5\xff\x30\x1d\x1d\x2d\x95\xd0\x63\x6f\x78\x93\x23\xea\x4d\xec\x0f\x4e\x7a\x75\x8f\x71\xd3\x7d\x25\xca\x6f\x4c\xe7\xc7\x0f\x25\x26\xa0\xe0\x98\xc5\x7e\xe2\x5b\x26\x9e\x41\x54\x7b\x68\x6f\x6a\xb6\xf9\x4f\xb5\xa7\xfe\xee\xab\xaf\x7e\xb7\x98\x51\x77\x02\xdd\x4b\xcb\x4c\x19\xf8\x7b\xf2\xde\xd5\x70\x2c\x87\xc4\xb7\xd4\xc7\x79\x8f\xa4\xa3\x92\x4e\xca\x71\xd8\xfd\x7c\xdf\xd2\x8f\xf7\x9c\x3e\x8d\x01\x83\xda\x6f\x14\x9e\xe6\xc2\xac\x5b\xfb\x73\x83\xd6\x9b\x98\x87\x09\xe2\xc1\x1d\x27\x6f\x64\x1b\x6d\xfa\x03\x42\xde\xa7\xdf\x33\x57\xe3\x84\xef\xb4\xe5\x8b\x5e\x28\x30\xf3\x8b\x0c\xf2\x2d\xec\x4e\x8b\x3e\xdf\x90\xdf\x9c\x5a\xc3\x2a\x66\xde\xc9\xa6\xf6\x37\x9f\xcc\x62\xd9\x32\x4e\xa5\xf3\xb7\x38\xc4\xd6\xae\x0c\xbd\x49\xb7\x27\x35\xaa\x64\x1e\x9d\x8f\x77\xb5\x8e\xa9\xcd\xaa\x2d\x70\x5d\x66\x00\xbb\xba\x9e\xf3\x3c\xc9\x13\x4e\x2c\x5d\x77\x75\x2d\xde\xd3\x2a\x41\x91\x38\xf0\x74\x9f\x08\xfe\x81\x97\x4f\xb7\xd4\x9a\x6a\x96\xc2\xc5\xc1\x82\xa4\xa2\x2c\x2a\x78\xd8\x8e\x6f\x11\x66\x1f\x8d\x63\x48\x9d\xee\x4b\x4a\x4e\x1b\x95\x71\xf3\xc5\x4a\x19\x43\xb3\xec\x46\xa4\x46\xea\x8e\xbc\x11\x63\x67\xe4\xa3\xa2\x73\xbc\x33\xdd\xf1\x76\x60\xa8\x46\xfd\xd0\xd4\x45\xd2\xaf\xf9\x42\xf4\xa5\x1b\xb0\x09\x83\xb0\xbb\x45\xd6\x7b\x10\xef\xbb\x5f\xcc\xb2\x8b\xad\x18\xbd\xcc\xb3\x47\xac\xb9\x42\x8e\x5b\xdc\x1b\xc4\xdd\x1f\xc2\xdd\xa1\xa6\xef\xef\xaf\xfe\x1c\x64\x67\xce\x08\xe5\x31\xa8\xe8\x9a\x18\xf8\x8e\x69\xaa\x42\x4f\x44\x6b\x29\x05\x5c\x5c\xad\x70\x65\x1b\x6c\x1e\xc3\x19\x5d\x81\x37\x81\x0b\xee\x8e\xd2\x01\xb4\xb9\x19\x23\x2f\x75\xd2\xe3\xc3\x24\xef\x33\x70\xbd\xf9\x00\x0f\xbe\x35\x7b\xc4\x96\x7c\x3f\xb6\x89\x43\x86\xa4\xa4\x4c\x45\xb3\x22\xa8\x46\x82\x02\x49\x75\xa5\xbd\x42\x80\x10\x5e\xde\x82\xee\xfd\xe8\x49\x7e\xeb\xcf\x67\xa0\x57\x7e\x66\x83\xce\x68\xf4\x30\x85\x09\x69\xb1\x3d\x39\x8f\x0a\x6c\x25\x38\xc2\x44\x37\x6a\xd7\x82\x58\x0c\x07\xdb\x2a\x53\xde\x82\x65\xf0\x1f\x9c\xd1\x8b\x5e\x7d\x85\x5b\xa8\x9f\x50\x75\x05\x8d\xb9\x37\x6c\xe9\xb3\xbf\x45\xcf\x95\x44\xf3\x79\x7e\xad\x56\xd6\xdc\x76\x6f\xdc\xb6\xbf\x6b\x3e\xb2\x13\x0b\x34\xa3\xc4\x3d\x6b\xa1\x68\xd7\x39\xe8\x1b\x98\xa8\xd6\x73\xc0\x41\xdd\x7b\x1a\xef\x10\xc8\x43\xdf\xd4\xe1\x47\xae\xf9\x30\x19\x10\xda\xb9\xa6\xba\xe3\x7e\xfd\xc7\x74\xe8\x58\xda\x21\xf7\x0c\x10\x21\x06\x09\xba\xda\xcd\xf9\x5b\x91\x0e\xed\x01\xc2\x23\xb9\xf9\xf1\xbd\xc8\xde\xa2\x37\x66\xa2\x56\xb7\x20\x16\x50\xad\x61\x31\x13\x8b\x56\x3a\x17\x2e\x7d\xe0\x71\x2a\x0b\xa0\x4b\xbb\x6b\xfd\x62\xaa\xa7\xb0\x0f\xd7\xf7\xbb\x0a\xb3\xa9\xa0\x4f\xf4\x16\xe2\x36\xb2\x91\xa6\x47\x6c\x63\x3c\xc2\x48\x43\x43\x83\x26\xd0\x4f\x60\x16\x1b\x2b\x0e\xc6\xef\xb0\xfa\xc6\x14\x5e\xb7\xb0\x7b\x62\xdc\xc2\x20\xf5\xe7\x91\x8f\x6c\xbc\xb1\xca\xef\x1e\x43\xcd\x80\xe3\xe7\x9e\x76\xd6\x0d\xf4\x79\xd8\xe7\xed\x44\x83\x69\x70\xe8\xbf\xaf\x27\xfa\x9b\xd4\x0e\x12\x4b\x62\x52\x8c\x17\x13\xf1\x6f\x2b\x85\x58\x67\x90\x0b\xc1\x05\x49\xf6\xc4\x93\x04\x0c\x64\x87\x32\xa7\xaa\x86\xd0\x34\x1d\xeb\x78\x09\x8d\x2a\x2f\x55\xf3\x5d\x7a\x24\xc6\x96\x27\x2b\x94\x27\xaa\xf1\xd7\x3a\x08\x1a\xe5\x4d\xb5\x04\x07\x65\x97\x9a\xdb\x4b\xa3\x35\x37\x01\xa0\xdf\x16\x96\x85\xba\x4a\xdf\xf4\x10\x7d\xe2\x59\xaf\x2a\xac\x68\xe4\x2e\x65\x64\x63\xf7\x70\xb6\xc1\x00\xfb\xf5\x25\x55\x32\xe2\x7d\xe8\xa8\x7a\xc8\xad\xd9\xca\x5a\x55\xf1\xc2\x11\xa5\xd7\x84\xd4\x06\x63\xe5\x58\x8e\xa7\xc7\x4e\xc2\xa7\x42\xc7\xaf\x9e\x2b\xdc\xb6\x3c\x8d\xb5\x52\x9e\x28\x0a\x9d\x12\x4a\xaf\xac\x74\xde\x76\x25\xd9\x9b\x18\x45\x55\xc3\x91\xc6\x71\xcb\x04\xcf\xf2\x3f\x8d\xe2\x51\x9a\xe9\x3c\x47\xd5\x97\x6b\xd3\xc3\x2f\xe8\x1c\x28\xef\x70\x45\x67\x05\xb2\x8e\x5f\x14\xca\x0b\xa0\xf5\x58\xad\x54\x19\xbb\x27\xe8\x6a\x38\xd4\xb5\xdf\xb2\xa9\xc9\x47\x43\xde\x41\x6c\x35\x0e\x2f\x1d\xa4\x38\xee\xdd\xf5\x28\x6f\xf0\x78\x07\xec\x5e\x33\x3f\x9c\xa3\x7a\x20\xe9\x19\x1f\x4e\x09\x07\x17\x3c\x57\x2a\x91\x24\x3f\x81\x2f\x17\x60\xf3\x67\x38\x6d\xc2\x21\x32\x55\x93\x4e\x8c\x1d\x94\x24\x4f\xf3\x2f\xda\x14\x3d\x2b\xa2\x8b\x17\x1a\x59\xf6\x22\x30\xb5\xff\x6d\x9d\x59\x33\xbd\x1c\x5f\x18\xdc\xb7\xf1\x67\xdf\xc1\x34\x9a\x8d\x7a\x06\x2e\xc9\xbf\x26\xdf\x4f\xfd\x16\x94\xe8\x8f\xc7\x89\x11\x63\x2c\xc1\x85\x0c\xd6\xde\x77\x9a\x8e\xb2\x74\xf7\x36\x80\x25\x9e\x1a\x7c\xc3\x90\x74\xe2\xad\xa9\xe0\x1a\x01\x45\xd0\xbf\x89\xa3\x1a\x4f\x15\x53\xf0\x02\xd3\x6e\xec\x90\x4c\xb1\x2c\x93\x97\x3d\xe3\x15\xab\xa4\x03\x23\x28\x93\xda\xda\x88\x9c\xbd\x26\x4c\xad\x4e\xba\xe2\x8b\x0c\x31\x8a\xd9\x4a\x55\xcb\x78\x23\xe2\xe5\xf5\x95\x68\xa4\x96\x6b\xba\xd2\x38\xe5\xef\x07\x48\xaa\xe7\x1a\xd7\x3c\x69\x77\x92\x2b\x37\x70\x70\x98\xcf\x0f\xc7\x26\x31\x0e\x58\xbc\x0c\x17\x77\xc6\x53\x1a\x7f\xe1\xd5\xe0\xe2\x86\x83\xbe\xfa\x89\x2f\x6d\xf0\x9b\xec\xfb\x08\xf1\x80\x95\x13\x6d\xb7\xac\xf9\x76\xe4\xec\x4a\x99\xe1\x12\x07\x26\xbd\x29\xc1\xdd\xc3\x77\xfd\x9d\x6f\xd3\xdf\x2d\x36\x98\x2a\x4e\xb0\x0e\xfd\x32\xab\x89\x1d\xa1\x74\xcd\x63\x97\x48\x7f\x6f\xcf\xa7\x36\x19\x7a\x60\x0a\x4a\x1e\xf4\x11\xa9\xb7\xb2\xe4\x15\x9f\x4a\xd0\x6f\x78\x85\x43\x24\x3d\x20\x1e\x91\xca\xad\x6d\x4c\x7d\x4a\x8d\x8b\x45\x98\x59\xad\x30\x5c\x06\xc9\xc5\xb7\xac\x60\x1f\xbe\x85\x79\x7a\xce\x27\x55\xc6\xe3\x8a\xa9\x7e\xd1\xab\x87\x60\x03\x93\xf9\x13\x27\xe1\xee\x68\x27\xce\xce\xbe\x97\xb0\x06\x7b\x76\x76\x5a\x64\x5b\xed\x73\x75\xff\xae\x33\x92\xce\x98\x85\x3e\x46\x9a\x7d\x8c\xcf\xc7\x98\x27\xef\x46\x9e\x3a\x8e\xa9\x2a\xcd\x23\xb2\x8b\x3a\xeb\xe0\x8b\x82\x4a\x8e\x47\x94\x14\x97\x56\xac\xa4\x97\x49\x6c\xdc\xf0\x0e\x85\x71\x83\xd9\xe9\xc4\x6c\xc7\x81\x18\x85\x8b\x12\x12\xbb\x05\xe4\x72\xde\x4e\xea\x70\x9a\x75\x27\x1a\x1c\x73\x7c\x9c\x6c\xda\x1a\xec\xdc\xc7\xcb\x3f\x0f\x50\xce\xfc\x4a\xc8\x65\x45\xcd\x71\x54\x1a\xed\xfc\xd1\x14\xec\x56\x5a\xd9\x3c\x12\x78\x1a\x59\xa0\x97\xb3\x65\x5e\x1d\x9d\xbe\xf8\xff\x01\x00\x00\xff\xff\xe6\x35\xc6\x70\xf0\x80\x00\x00"), }, "/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{ name: "user-cluster-role.yaml", diff --git a/deploy/traits.yaml b/deploy/traits.yaml index 6be819b9d4..837dc8b935 100755 --- a/deploy/traits.yaml +++ b/deploy/traits.yaml @@ -23,16 +23,16 @@ traits: description: Never co-locates multiple replicas of the integration in the same node (default *false*). - name: node-affinity-labels - type: string + type: '[]string' description: Defines a set of nodes the integration pod(s) are eligible to be scheduled on, based on labels on the node. - name: pod-affinity-labels - type: string + type: '[]string' description: Defines a set of pods (namely those matching the label selector, relative to the given namespace) that theintegration pod(s) should be co-located with. - name: pod-anti-affinity-labels - type: string + type: '[]string' description: Defines a set of pods (namely those matching the label selector, relative to the given namespace) that theintegration pod(s) should not be co-located with. @@ -253,11 +253,7 @@ traits: - OpenShift description: The Deployment trait is responsible for generating the Kubernetes deployment that will make surethe integration will run in the cluster. - properties: - - name: enabled - type: bool - description: Can be used to enable or disable a trait. All traits share this common - property. + properties: [] - name: environment platform: true profiles: @@ -390,10 +386,9 @@ traits: description: Whether client certificates should be used for authentication (default `true` for OpenShift). - name: options - type: string - description: 'A comma-separated list of additional Jolokia options as definedin - https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration - options],e.g.: `keystore=...,executor=...`' + type: '[]string' + description: A list of additional Jolokia options as definedin https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM + agent configuration options] - name: jvm platform: true profiles: @@ -413,17 +408,17 @@ traits: - name: debug-suspend type: bool description: Suspends the target JVM immediately before the main class is loaded + - name: print-command + type: bool + description: Prints the command used the start the JVM in the container logs (default + `true`) - name: debug-address type: string description: Transport address at which to listen for the newly launched JVM (default `*:5005`) - name: options - type: string - description: A comma-separated list of JVM options - - name: print-command - type: bool - description: Prints the command used the start the JVM in the container logs (default - `true`) + type: '[]string' + description: A list of JVM options - name: knative-service platform: false profiles: @@ -431,7 +426,7 @@ traits: description: The Knative Service trait allows to configure options when running the integration as Knative service instead ofa standard Kubernetes Deployment.Running integrations as Knative Services adds auto-scaling (and scaling-to-zero) features, - but those features are only meaningful when the routes use a HTTP endpoint consumer. + but those featuresare only meaningful when the routes use a HTTP endpoint consumer. properties: - name: enabled type: bool @@ -487,29 +482,29 @@ traits: type: string description: Can be used to inject a Knative complete configuration in JSON format. - name: channel-sources - type: string - description: Comma-separated list of channels used as source of integration routes.Can - contain simple channel names or full Camel URIs. + type: '[]string' + description: List of channels used as source of integration routes.Can contain + simple channel names or full Camel URIs. - name: channel-sinks - type: string - description: Comma-separated list of channels used as destination of integration - routes.Can contain simple channel names or full Camel URIs. + type: '[]string' + description: List of channels used as destination of integration routes.Can contain + simple channel names or full Camel URIs. - name: endpoint-sources - type: string - description: Comma-separated list of channels used as source of integration routes. + type: '[]string' + description: List of channels used as source of integration routes. - name: endpoint-sinks - type: string - description: Comma-separated list of endpoints used as destination of integration - routes.Can contain simple endpoint names or full Camel URIs. + type: '[]string' + description: List of endpoints used as destination of integration routes.Can contain + simple endpoint names or full Camel URIs. - name: event-sources - type: string - description: Comma-separated list of event types that the integration will be - subscribed to.Can contain simple event types or full Camel URIs (to use a specific - broker different from "default"). + type: '[]string' + description: List of event types that the integration will be subscribed to.Can + contain simple event types or full Camel URIs (to use a specific broker different + from "default"). - name: event-sinks - type: string - description: Comma-separated list of event types that the integration will produce.Can - contain simple event types or full Camel URIs (to use a specific broker). + type: '[]string' + description: List of event types that the integration will produce.Can contain + simple event types or full Camel URIs (to use a specific broker). - name: filter-source-channels type: bool description: Enables filtering on events based on the header "ce-knativehistory". @@ -586,12 +581,11 @@ traits: description: Can be used to enable or disable a trait. All traits share this common property. - name: target-annotations - type: string - description: The annotations to be transferred (A comma-separated list of label - keys) + type: '[]string' + description: The set of annotations to be transferred - name: target-labels - type: string - description: The labels to be transferred (A comma-separated list of label keys) + type: '[]string' + description: The set of labels to be transferred - name: platform platform: true profiles: @@ -643,7 +637,7 @@ traits: type: bool description: Whether a `ServiceMonitor` resource is created (default `true`). - name: service-monitor-labels - type: string + type: '[]string' description: The `ServiceMonitor` resource labels, applicable when `service-monitor` is `true`. - name: configmap @@ -754,6 +748,9 @@ traits: - name: auto type: bool description: To automatically detect from the code if a Service needs to be created. + - name: node-port + type: bool + description: Enable Service to be exposed as NodePort - name: 3scale platform: false profiles: diff --git a/docs/modules/traits/pages/affinity.adoc b/docs/modules/traits/pages/affinity.adoc index 3238390903..e43cf92bcb 100755 --- a/docs/modules/traits/pages/affinity.adoc +++ b/docs/modules/traits/pages/affinity.adoc @@ -36,16 +36,16 @@ The following configuration options are available: | Never co-locates multiple replicas of the integration in the same node (default *false*). | affinity.node-affinity-labels -| string +| []string | Defines a set of nodes the integration pod(s) are eligible to be scheduled on, based on labels on the node. | affinity.pod-affinity-labels -| string +| []string | Defines a set of pods (namely those matching the label selector, relative to the given namespace) that the integration pod(s) should be co-located with. | affinity.pod-anti-affinity-labels -| string +| []string | Defines a set of pods (namely those matching the label selector, relative to the given namespace) that the integration pod(s) should not be co-located with. diff --git a/docs/modules/traits/pages/deployment.adoc b/docs/modules/traits/pages/deployment.adoc index 103b0e1b25..3626683006 100755 --- a/docs/modules/traits/pages/deployment.adoc +++ b/docs/modules/traits/pages/deployment.adoc @@ -15,7 +15,7 @@ WARNING: The deployment trait is a *platform trait*: disabling it may compromise Trait properties can be specified when running any integration with the CLI: ``` -kamel run --trait deployment.[key]=[value] --trait deployment.[key2]=[value2] integration.groovy +kamel run --trait deployment.[key]=[value] integration.groovy ``` The following configuration options are available: diff --git a/docs/modules/traits/pages/jolokia.adoc b/docs/modules/traits/pages/jolokia.adoc index 433e8de930..9332b431db 100755 --- a/docs/modules/traits/pages/jolokia.adoc +++ b/docs/modules/traits/pages/jolokia.adoc @@ -74,10 +74,9 @@ the servers binds to every network interface (default `"*"`). | Whether client certificates should be used for authentication (default `true` for OpenShift). | jolokia.options -| string -| A comma-separated list of additional Jolokia options as defined -in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], -e.g.: `keystore=...,executor=...` +| []string +| A list of additional Jolokia options as defined +in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options] |=== diff --git a/docs/modules/traits/pages/jvm.adoc b/docs/modules/traits/pages/jvm.adoc index bd94aacabf..913ef7de45 100755 --- a/docs/modules/traits/pages/jvm.adoc +++ b/docs/modules/traits/pages/jvm.adoc @@ -34,17 +34,17 @@ The following configuration options are available: | bool | Suspends the target JVM immediately before the main class is loaded +| jvm.print-command +| bool +| Prints the command used the start the JVM in the container logs (default `true`) + | jvm.debug-address | string | Transport address at which to listen for the newly launched JVM (default `*:5005`) | jvm.options -| string -| A comma-separated list of JVM options - -| jvm.print-command -| bool -| Prints the command used the start the JVM in the container logs (default `true`) +| []string +| A list of JVM options |=== diff --git a/docs/modules/traits/pages/knative.adoc b/docs/modules/traits/pages/knative.adoc index 2d77cc1ea4..80f332fe54 100755 --- a/docs/modules/traits/pages/knative.adoc +++ b/docs/modules/traits/pages/knative.adoc @@ -35,32 +35,32 @@ The following configuration options are available: | Can be used to inject a Knative complete configuration in JSON format. | knative.channel-sources -| string -| Comma-separated list of channels used as source of integration routes. +| []string +| List of channels used as source of integration routes. Can contain simple channel names or full Camel URIs. | knative.channel-sinks -| string -| Comma-separated list of channels used as destination of integration routes. +| []string +| List of channels used as destination of integration routes. Can contain simple channel names or full Camel URIs. | knative.endpoint-sources -| string -| Comma-separated list of channels used as source of integration routes. +| []string +| List of channels used as source of integration routes. | knative.endpoint-sinks -| string -| Comma-separated list of endpoints used as destination of integration routes. +| []string +| List of endpoints used as destination of integration routes. Can contain simple endpoint names or full Camel URIs. | knative.event-sources -| string -| Comma-separated list of event types that the integration will be subscribed to. +| []string +| List of event types that the integration will be subscribed to. Can contain simple event types or full Camel URIs (to use a specific broker different from "default"). | knative.event-sinks -| string -| Comma-separated list of event types that the integration will produce. +| []string +| List of event types that the integration will produce. Can contain simple event types or full Camel URIs (to use a specific broker). | knative.filter-source-channels diff --git a/docs/modules/traits/pages/owner.adoc b/docs/modules/traits/pages/owner.adoc index cd4b23c009..2a8e4c8dfe 100755 --- a/docs/modules/traits/pages/owner.adoc +++ b/docs/modules/traits/pages/owner.adoc @@ -28,12 +28,12 @@ The following configuration options are available: | Can be used to enable or disable a trait. All traits share this common property. | owner.target-annotations -| string -| The annotations to be transferred (A comma-separated list of label keys) +| []string +| The set of annotations to be transferred | owner.target-labels -| string -| The labels to be transferred (A comma-separated list of label keys) +| []string +| The set of labels to be transferred |=== diff --git a/docs/modules/traits/pages/prometheus.adoc b/docs/modules/traits/pages/prometheus.adoc index 29e02effb1..595aa63b5b 100755 --- a/docs/modules/traits/pages/prometheus.adoc +++ b/docs/modules/traits/pages/prometheus.adoc @@ -44,7 +44,7 @@ The following configuration options are available: | Whether a `ServiceMonitor` resource is created (default `true`). | prometheus.service-monitor-labels -| string +| []string | The `ServiceMonitor` resource labels, applicable when `service-monitor` is `true`. | prometheus.configmap diff --git a/docs/modules/traits/pages/service.adoc b/docs/modules/traits/pages/service.adoc index 79d63bd25b..28878f3cce 100755 --- a/docs/modules/traits/pages/service.adoc +++ b/docs/modules/traits/pages/service.adoc @@ -31,6 +31,10 @@ The following configuration options are available: | bool | To automatically detect from the code if a Service needs to be created. +| service.node-port +| bool +| Enable Service to be exposed as NodePort + |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index 6157ce4d3e..57ac9ca7be 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -160,9 +160,9 @@ spec: description: A TraitSpec contains the configuration of a trait properties: configuration: - additionalProperties: - type: string type: object + required: + - configuration type: object type: object type: object diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go index 47d4afc1b6..d7b9e353a5 100644 --- a/pkg/apis/camel/v1/common_types.go +++ b/pkg/apis/camel/v1/common_types.go @@ -55,7 +55,14 @@ type FailureRecovery struct { // A TraitSpec contains the configuration of a trait type TraitSpec struct { - Configuration map[string]string `json:"configuration,omitempty"` + Configuration TraitConfiguration `json:"configuration"` +} + +// +kubebuilder:validation:Type=object + +// TraitConfiguration -- +type TraitConfiguration struct { + json.RawMessage `json:",inline"` } // Configurable -- diff --git a/pkg/apis/camel/v1/common_types_support.go b/pkg/apis/camel/v1/common_types_support.go index d47c8b4b6e..cf06cb863f 100644 --- a/pkg/apis/camel/v1/common_types_support.go +++ b/pkg/apis/camel/v1/common_types_support.go @@ -19,8 +19,6 @@ package v1 import ( "fmt" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func (in *Artifact) String() string { @@ -31,14 +29,6 @@ func (in *ConfigurationSpec) String() string { return fmt.Sprintf("%s=%s", in.Type, in.Value) } -// NewErrorFailure -- -func NewErrorFailure(err error) *Failure { - return &Failure{ - Reason: err.Error(), - Time: metav1.Now(), - } -} - // CapabilityDependencies --- func (in *RuntimeSpec) CapabilityDependencies(capability string) []MavenArtifact { deps := make([]MavenArtifact, 0) diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index f8f17f16df..d48aa415fa 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -1352,15 +1352,30 @@ func (in *Task) DeepCopy() *Task { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TraitSpec) DeepCopyInto(out *TraitSpec) { +func (in *TraitConfiguration) DeepCopyInto(out *TraitConfiguration) { *out = *in - if in.Configuration != nil { - in, out := &in.Configuration, &out.Configuration - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } + if in.RawMessage != nil { + in, out := &in.RawMessage, &out.RawMessage + *out = make(json.RawMessage, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TraitConfiguration. +func (in *TraitConfiguration) DeepCopy() *TraitConfiguration { + if in == nil { + return nil } + out := new(TraitConfiguration) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TraitSpec) DeepCopyInto(out *TraitSpec) { + *out = *in + in.Configuration.DeepCopyInto(&out.Configuration) return } diff --git a/pkg/cmd/describe.go b/pkg/cmd/describe.go index 70cb23dab5..66b38f24f2 100644 --- a/pkg/cmd/describe.go +++ b/pkg/cmd/describe.go @@ -18,15 +18,16 @@ limitations under the License. package cmd import ( + "encoding/json" "strings" "time" - "github.com/apache/camel-k/pkg/util/indentedwriter" - - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util/indentedwriter" ) func describeObjectMeta(w *indentedwriter.Writer, om metav1.ObjectMeta) { @@ -50,18 +51,28 @@ func describeObjectMeta(w *indentedwriter.Writer, om metav1.ObjectMeta) { w.Write(0, "Creation Timestamp:\t%s\n", om.CreationTimestamp.Format(time.RFC1123Z)) } -func describeTraits(w *indentedwriter.Writer, traits map[string]v1.TraitSpec) { +func describeTraits(w *indentedwriter.Writer, traits map[string]v1.TraitSpec) error { if len(traits) > 0 { w.Write(0, "Traits:\n") for trait := range traits { w.Write(1, "%s:\n", strings.Title(trait)) - w.Write(2, "Configuration:\n") - for k, v := range traits[trait].Configuration { - w.Write(3, "%s:\t%s\n", strings.Title(k), v) + //TODO: print the whole TraitSpec as Yaml + data, err := json.Marshal(traits[trait]) + if err != nil { + return err + } + config := make(map[string]interface{}) + err = json.Unmarshal(data, &config) + if err != nil { + return err + } + for k, v := range config { + w.Write(2, "%s:\t%v\n", strings.Title(k), v) } } } + return nil } func newCmdDescribe(rootCmdOptions *RootCmdOptions) *cobra.Command { diff --git a/pkg/cmd/describe_integration.go b/pkg/cmd/describe_integration.go index c7396e450c..3d6b7ccdcf 100644 --- a/pkg/cmd/describe_integration.go +++ b/pkg/cmd/describe_integration.go @@ -23,12 +23,12 @@ import ( "io" "strings" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/apache/camel-k/pkg/util/indentedwriter" - "github.com/spf13/cobra" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util/indentedwriter" ) func newDescribeIntegrationCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describeIntegrationCommandOptions) { @@ -93,8 +93,8 @@ func (command *describeIntegrationCommandOptions) run(args []string) error { return nil } -func (command *describeIntegrationCommandOptions) describeIntegration(i v1.Integration) string { - return indentedwriter.IndentedString(func(out io.Writer) { +func (command *describeIntegrationCommandOptions) describeIntegration(i v1.Integration) (string, error) { + return indentedwriter.IndentedString(func(out io.Writer) error { w := indentedwriter.NewWriter(out) describeObjectMeta(w, i.ObjectMeta) @@ -178,6 +178,6 @@ func (command *describeIntegrationCommandOptions) describeIntegration(i v1.Integ } } - describeTraits(w, i.Spec.Traits) + return describeTraits(w, i.Spec.Traits) }) } diff --git a/pkg/cmd/describe_kit.go b/pkg/cmd/describe_kit.go index 8d7fb186d3..73dea2ba7f 100644 --- a/pkg/cmd/describe_kit.go +++ b/pkg/cmd/describe_kit.go @@ -22,11 +22,12 @@ import ( "fmt" "io" - "github.com/apache/camel-k/pkg/util/indentedwriter" - - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/spf13/cobra" + k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util/indentedwriter" ) func newDescribeKitCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describeKitCommandOptions) { @@ -86,8 +87,8 @@ func (command *describeKitCommandOptions) run(args []string) error { return nil } -func (command *describeKitCommandOptions) describeIntegrationKit(kit v1.IntegrationKit) string { - return indentedwriter.IndentedString(func(out io.Writer) { +func (command *describeKitCommandOptions) describeIntegrationKit(kit v1.IntegrationKit) (string, error) { + return indentedwriter.IndentedString(func(out io.Writer) error { w := indentedwriter.NewWriter(out) describeObjectMeta(w, kit.ObjectMeta) @@ -126,6 +127,6 @@ func (command *describeKitCommandOptions) describeIntegrationKit(kit v1.Integrat } } - describeTraits(w, kit.Spec.Traits) + return describeTraits(w, kit.Spec.Traits) }) } diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go index 4bee518214..fef0506dc2 100644 --- a/pkg/cmd/describe_platform.go +++ b/pkg/cmd/describe_platform.go @@ -22,11 +22,12 @@ import ( "fmt" "io" - "github.com/apache/camel-k/pkg/util/indentedwriter" - - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/spf13/cobra" + k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util/indentedwriter" ) func newDescribePlatformCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describePlatformCommandOptions) { @@ -86,8 +87,8 @@ func (command *describePlatformCommandOptions) run(args []string) error { return nil } -func (command *describePlatformCommandOptions) describeIntegrationPlatform(platform v1.IntegrationPlatform) string { - return indentedwriter.IndentedString(func(out io.Writer) { +func (command *describePlatformCommandOptions) describeIntegrationPlatform(platform v1.IntegrationPlatform) (string, error) { + return indentedwriter.IndentedString(func(out io.Writer) error { w := indentedwriter.NewWriter(out) describeObjectMeta(w, platform.ObjectMeta) w.Write(0, "Phase:\t%s\n", platform.Status.Phase) @@ -108,6 +109,7 @@ func (command *describePlatformCommandOptions) describeIntegrationPlatform(platf w.Write(2, "%s\n", kit) } } + return nil }) } diff --git a/pkg/cmd/kit_create.go b/pkg/cmd/kit_create.go index cfec03782c..e757fe7b64 100644 --- a/pkg/cmd/kit_create.go +++ b/pkg/cmd/kit_create.go @@ -22,15 +22,15 @@ import ( "fmt" "strings" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/apache/camel-k/pkg/trait" - "github.com/apache/camel-k/pkg/util" - "github.com/apache/camel-k/pkg/util/kubernetes" - "github.com/spf13/cobra" k8serrors "k8s.io/apimachinery/pkg/api/errors" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/trait" + "github.com/apache/camel-k/pkg/util" + "github.com/apache/camel-k/pkg/util/kubernetes" ) func newKitCreateCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitCreateCommandOptions) { @@ -98,93 +98,87 @@ func (command *kitCreateCommandOptions) run(_ *cobra.Command, args []string) err } } - ctx := v1.NewIntegrationKit(command.Namespace, args[0]) + kit := v1.NewIntegrationKit(command.Namespace, args[0]) key := k8sclient.ObjectKey{ Namespace: command.Namespace, Name: args[0], } - if err := c.Get(command.Context, key, &ctx); err == nil { + if err := c.Get(command.Context, key, &kit); err == nil { // the integration kit already exists, let's check that it is // not a platform one which is supposed to be "read only" - if ctx.Labels["camel.apache.org/kit.type"] == v1.IntegrationKitTypePlatform { - fmt.Printf("integration kit \"%s\" is not editable\n", ctx.Name) + if kit.Labels["camel.apache.org/kit.type"] == v1.IntegrationKitTypePlatform { + fmt.Printf("integration kit \"%s\" is not editable\n", kit.Name) return nil } } - ctx = v1.NewIntegrationKit(command.Namespace, kubernetes.SanitizeName(args[0])) - ctx.Labels = map[string]string{ + kit = v1.NewIntegrationKit(command.Namespace, kubernetes.SanitizeName(args[0])) + kit.Labels = map[string]string{ "camel.apache.org/kit.type": v1.IntegrationKitTypeUser, } - ctx.Spec = v1.IntegrationKitSpec{ + kit.Spec = v1.IntegrationKitSpec{ Dependencies: make([]string, 0, len(command.Dependencies)), Configuration: make([]v1.ConfigurationSpec, 0), Repositories: command.Repositories, } if command.Image != "" { - // // if the Image is set, the kit do not require any build but // is be marked as external as the information about the classpath // is missing so it cannot be used as base for other Kits - // - ctx.Labels["camel.apache.org/kit.type"] = v1.IntegrationKitTypeExternal + kit.Labels["camel.apache.org/kit.type"] = v1.IntegrationKitTypeExternal - // // Set the Image to be used by the kit - // - ctx.Spec.Image = command.Image + kit.Spec.Image = command.Image } for _, item := range command.Dependencies { switch { case strings.HasPrefix(item, "mvn:"): - ctx.Spec.Dependencies = append(ctx.Spec.Dependencies, item) + kit.Spec.Dependencies = append(kit.Spec.Dependencies, item) case strings.HasPrefix(item, "file:"): - ctx.Spec.Dependencies = append(ctx.Spec.Dependencies, item) + kit.Spec.Dependencies = append(kit.Spec.Dependencies, item) case strings.HasPrefix(item, "camel-quarkus-"): - ctx.Spec.Dependencies = append(ctx.Spec.Dependencies, "camel-quarkus:"+strings.TrimPrefix(item, "camel-quarkus-")) + kit.Spec.Dependencies = append(kit.Spec.Dependencies, "camel-quarkus:"+strings.TrimPrefix(item, "camel-quarkus-")) case strings.HasPrefix(item, "camel-"): - ctx.Spec.Dependencies = append(ctx.Spec.Dependencies, "camel:"+strings.TrimPrefix(item, "camel-")) + kit.Spec.Dependencies = append(kit.Spec.Dependencies, "camel:"+strings.TrimPrefix(item, "camel-")) } } for _, item := range command.Properties { - ctx.Spec.Configuration = append(ctx.Spec.Configuration, v1.ConfigurationSpec{ + kit.Spec.Configuration = append(kit.Spec.Configuration, v1.ConfigurationSpec{ Type: "property", Value: item, }) } for _, item := range command.Configmaps { - ctx.Spec.Configuration = append(ctx.Spec.Configuration, v1.ConfigurationSpec{ + kit.Spec.Configuration = append(kit.Spec.Configuration, v1.ConfigurationSpec{ Type: "configmap", Value: item, }) } for _, item := range command.Secrets { - ctx.Spec.Configuration = append(ctx.Spec.Configuration, v1.ConfigurationSpec{ + kit.Spec.Configuration = append(kit.Spec.Configuration, v1.ConfigurationSpec{ Type: "secret", Value: item, }) } - for _, item := range command.Traits { - if err := command.configureTrait(&ctx, item); err != nil { - return nil - } + if err := command.configureTraits(&kit, command.Traits, catalog); err != nil { + return nil } existed := false - err = c.Create(command.Context, &ctx) + err = c.Create(command.Context, &kit) if err != nil && k8serrors.IsAlreadyExists(err) { existed = true - clone := ctx.DeepCopy() + clone := kit.DeepCopy() err = c.Get(command.Context, key, clone) if err != nil { fmt.Print(err.Error()) return nil } - ctx.ResourceVersion = clone.ResourceVersion - err = c.Update(command.Context, &ctx) + kit.ResourceVersion = clone.ResourceVersion + err = c.Update(command.Context, &kit) } if err != nil { @@ -193,35 +187,21 @@ func (command *kitCreateCommandOptions) run(_ *cobra.Command, args []string) err } if !existed { - fmt.Printf("integration kit \"%s\" created\n", ctx.Name) + fmt.Printf("integration kit \"%s\" created\n", kit.Name) } else { - fmt.Printf("integration kit \"%s\" updated\n", ctx.Name) + fmt.Printf("integration kit \"%s\" updated\n", kit.Name) } return nil } -func (*kitCreateCommandOptions) configureTrait(ctx *v1.IntegrationKit, config string) error { - if ctx.Spec.Traits == nil { - ctx.Spec.Traits = make(map[string]v1.TraitSpec) - } - - parts := traitConfigRegexp.FindStringSubmatch(config) - if len(parts) < 4 { - return errors.New("unrecognized config format (expected \".=\"): " + config) +func (*kitCreateCommandOptions) configureTraits(kit *v1.IntegrationKit, options []string, catalog *trait.Catalog) error { + traits, err := configureTraits(options, catalog) + if err != nil { + return err } - traitID := parts[1] - prop := parts[2][1:] - val := parts[3] - spec, ok := ctx.Spec.Traits[traitID] - if !ok { - spec = v1.TraitSpec{ - Configuration: make(map[string]string), - } - } + kit.Spec.Traits = traits - spec.Configuration[prop] = val - ctx.Spec.Traits[traitID] = spec return nil } diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go index 5927a47e52..7d150af921 100644 --- a/pkg/cmd/run.go +++ b/pkg/cmd/run.go @@ -20,6 +20,7 @@ package cmd import ( "bytes" "encoding/base64" + "encoding/json" "fmt" "io/ioutil" @@ -32,6 +33,17 @@ import ( "strings" "syscall" + "github.com/magiconair/properties" + "github.com/mitchellh/mapstructure" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + corev1 "k8s.io/api/core/v1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/client" "github.com/apache/camel-k/pkg/trait" @@ -42,14 +54,6 @@ import ( k8slog "github.com/apache/camel-k/pkg/util/kubernetes/log" "github.com/apache/camel-k/pkg/util/sync" "github.com/apache/camel-k/pkg/util/watch" - "github.com/magiconair/properties" - "github.com/pkg/errors" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - corev1 "k8s.io/api/core/v1" - k8serrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - k8sclient "sigs.k8s.io/controller-runtime/pkg/client" ) var ( @@ -220,7 +224,6 @@ func (o *runCmdOptions) validateArgs(_ *cobra.Command, args []string) error { } func (o *runCmdOptions) validate() error { - for _, volume := range o.Volumes { volumeConfig := strings.Split(volume, ":") if len(volumeConfig) != 2 || len(strings.TrimSpace(volumeConfig[0])) == 0 || len(strings.TrimSpace(volumeConfig[1])) == 0 { @@ -267,7 +270,7 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error { } } - integration, err := o.createIntegration(c, args) + integration, err := o.createIntegration(c, args, catalog) if err != nil { return err } @@ -288,7 +291,7 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error { } if o.Sync || o.Dev { - err = o.syncIntegration(c, args) + err = o.syncIntegration(c, args, catalog) if err != nil { return err } @@ -384,7 +387,7 @@ func (o *runCmdOptions) waitForIntegrationReady(cmd *cobra.Command, integration return watch.HandleIntegrationStateChanges(o.Context, integration, handler) } -func (o *runCmdOptions) syncIntegration(c client.Client, sources []string) error { +func (o *runCmdOptions) syncIntegration(c client.Client, sources []string, catalog *trait.Catalog) error { // Let's watch all relevant files when in dev mode var files []string files = append(files, sources...) @@ -404,7 +407,7 @@ func (o *runCmdOptions) syncIntegration(c client.Client, sources []string) error case <-o.Context.Done(): return case <-changes: - _, err := o.updateIntegrationCode(c, sources) + _, err := o.updateIntegrationCode(c, sources, catalog) if err != nil { fmt.Println("Unable to sync integration: ", err.Error()) } @@ -419,12 +422,12 @@ func (o *runCmdOptions) syncIntegration(c client.Client, sources []string) error return nil } -func (o *runCmdOptions) createIntegration(c client.Client, sources []string) (*v1.Integration, error) { - return o.updateIntegrationCode(c, sources) +func (o *runCmdOptions) createIntegration(c client.Client, sources []string, catalog *trait.Catalog) (*v1.Integration, error) { + return o.updateIntegrationCode(c, sources, catalog) } //nolint: gocyclo -func (o *runCmdOptions) updateIntegrationCode(c client.Client, sources []string) (*v1.Integration, error) { +func (o *runCmdOptions) updateIntegrationCode(c client.Client, sources []string, catalog *trait.Catalog) (*v1.Integration, error) { namespace := o.Namespace name := o.GetIntegrationName(sources) @@ -547,10 +550,8 @@ func (o *runCmdOptions) updateIntegrationCode(c client.Client, sources []string) integration.Spec.AddConfiguration("env", item) } - for _, traitConf := range o.Traits { - if err := o.configureTrait(&integration, traitConf); err != nil { - return nil, err - } + if err := o.configureTraits(&integration, o.Traits, catalog); err != nil { + return nil, err } switch o.OutputFormat { @@ -669,38 +670,14 @@ func loadData(source string, compress bool) (string, error) { return string(content), nil } -func (*runCmdOptions) configureTrait(integration *v1.Integration, config string) error { - if integration.Spec.Traits == nil { - integration.Spec.Traits = make(map[string]v1.TraitSpec) +func (*runCmdOptions) configureTraits(integration *v1.Integration, options []string, catalog *trait.Catalog) error { + traits, err := configureTraits(options, catalog) + if err != nil { + return err } - parts := traitConfigRegexp.FindStringSubmatch(config) - if len(parts) < 4 { - return errors.New("unrecognized config format (expected \".=\"): " + config) - } - traitID := parts[1] - prop := parts[2][1:] - val := parts[3] + integration.Spec.Traits = traits - spec, ok := integration.Spec.Traits[traitID] - if !ok { - spec = v1.TraitSpec{ - Configuration: make(map[string]string), - } - } - - if len(spec.Configuration[prop]) > 0 { - // Aggregate multiple occurrences of the same option into a comma-separated string, - // attempting to follow POSIX conventions. - // This enables to execute: - // $ kamel run -t .= ... -t .= - // Or: - // $ kamel run --trait .=,...,.= - spec.Configuration[prop] = spec.Configuration[prop] + "," + val - } else { - spec.Configuration[prop] = val - } - integration.Spec.Traits[traitID] = spec return nil } @@ -744,3 +721,77 @@ func escapePropertyFileItem(item string) string { item = strings.ReplaceAll(item, `:`, `\:`) return item } + +func configureTraits(options []string, catalog *trait.Catalog) (map[string]v1.TraitSpec, error) { + traits := make(map[string]map[string]interface{}) + + for _, option := range options { + parts := traitConfigRegexp.FindStringSubmatch(option) + if len(parts) < 4 { + return nil, errors.New("unrecognized config format (expected \".=\"): " + option) + } + id := parts[1] + prop := parts[2][1:] + value := parts[3] + if _, ok := traits[id]; !ok { + traits[id] = make(map[string]interface{}) + } + switch v := traits[id][prop].(type) { + case []string: + traits[id][prop] = append(v, value) + case string: + // Aggregate multiple occurrences of the same option into a string array, to emulate POSIX conventions. + // This enables executing: + // $ kamel run -t .= ... -t .= + // Or: + // $ kamel run --trait .=,...,.= + traits[id][prop] = []string{v, value} + case nil: + traits[id][prop] = value + } + } + + specs := make(map[string]v1.TraitSpec) + for id, config := range traits { + t := catalog.GetTrait(id) + if t != nil { + // let's take a clone to prevent default values set at runtime from being serialized + zero := reflect.New(reflect.TypeOf(t)).Interface() + err := configureTrait(config, zero) + if err != nil { + return nil, err + } + data, err := json.Marshal(zero) + if err != nil { + return nil, err + } + var spec v1.TraitSpec + err = json.Unmarshal(data, &spec.Configuration) + if err != nil { + return nil, err + } + specs[id] = spec + } + } + + return specs, nil +} + +func configureTrait(config map[string]interface{}, trait interface{}) error { + md := mapstructure.Metadata{} + + decoder, err := mapstructure.NewDecoder( + &mapstructure.DecoderConfig{ + Metadata: &md, + WeaklyTypedInput: true, + TagName: "property", + Result: &trait, + }, + ) + + if err != nil { + return err + } + + return decoder.Decode(config) +} diff --git a/pkg/cmd/trait_help.go b/pkg/cmd/trait_help.go index ff15c38d89..a000ba1e03 100644 --- a/pkg/cmd/trait_help.go +++ b/pkg/cmd/trait_help.go @@ -25,16 +25,14 @@ import ( "reflect" "strings" - "github.com/apache/camel-k/deploy" - "github.com/apache/camel-k/pkg/util/indentedwriter" - "github.com/fatih/structs" + "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/apache/camel-k/pkg/trait" - + "github.com/apache/camel-k/deploy" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/spf13/cobra" + "github.com/apache/camel-k/pkg/trait" + "github.com/apache/camel-k/pkg/util/indentedwriter" ) func newTraitHelpCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *traitHelpCommandOptions) { @@ -158,7 +156,11 @@ func (command *traitHelpCommandOptions) run(cmd *cobra.Command, args []string) e } fmt.Fprintln(cmd.OutOrStdout(), string(res)) default: - fmt.Fprintln(cmd.OutOrStdout(), outputTraits(traitDescriptions)) + res, err := outputTraits(traitDescriptions) + if err != nil { + return err + } + fmt.Fprintln(cmd.OutOrStdout(), res) } return nil @@ -232,8 +234,8 @@ func computeTraitProperties(fields []*structs.Field, properties *[]traitProperty } } -func outputTraits(descriptions []*traitDescription) string { - return indentedwriter.IndentedString(func(out io.Writer) { +func outputTraits(descriptions []*traitDescription) (string, error) { + return indentedwriter.IndentedString(func(out io.Writer) error { w := indentedwriter.NewWriter(out) for _, td := range descriptions { @@ -250,5 +252,7 @@ func outputTraits(descriptions []*traitDescription) string { } w.Writeln(0, "") } + + return nil }) } diff --git a/pkg/controller/integration/util.go b/pkg/controller/integration/util.go index a2e975d215..16cc94e23c 100644 --- a/pkg/controller/integration/util.go +++ b/pkg/controller/integration/util.go @@ -19,17 +19,16 @@ package integration import ( "context" - - "github.com/apache/camel-k/pkg/util/controller" - - "k8s.io/apimachinery/pkg/selection" + "encoding/json" "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/selection" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util" + "github.com/apache/camel-k/pkg/util/controller" "github.com/apache/camel-k/pkg/util/kubernetes" ) @@ -89,7 +88,6 @@ func LookupKitForIntegration(ctx context.Context, c k8sclient.Reader, integratio continue } - // // When a platform kit is created it inherits the traits from the integrations and as // some traits may influence the build thus the artifacts present on the container image, // we need to take traits into account when looking up for compatible kits. @@ -100,11 +98,13 @@ func LookupKitForIntegration(ctx context.Context, c k8sclient.Reader, integratio // // A kit can be used only if it contains a subset of the traits and related configurations // declared on integration. - // - if !HasMatchingTraits(&kit, integration) { + match, err := HasMatchingTraits(&kit, integration) + if err != nil { + return nil, err + } + if !match { continue } - if util.StringSliceContains(kit.Spec.Dependencies, integration.Status.Dependencies) { return &kit, nil } @@ -114,29 +114,45 @@ func LookupKitForIntegration(ctx context.Context, c k8sclient.Reader, integratio } // HasMatchingTraits compare traits defined on kit against those defined on integration. -func HasMatchingTraits(kit *v1.IntegrationKit, integration *v1.Integration) bool { - for kitTraitName, kitTraitConf := range kit.Spec.Traits { - iTraitConf, ok := integration.Spec.Traits[kitTraitName] +func HasMatchingTraits(kit *v1.IntegrationKit, integration *v1.Integration) (bool, error) { + for name, kitTrait := range kit.Spec.Traits { + intTrait, ok := integration.Spec.Traits[name] if !ok { - // skip it because trait configured on kit is not defined on integration. - return false + // skip it because trait configured on kit is not defined on integration + return false, nil } - - for ck, cv := range kitTraitConf.Configuration { - iv, ok := iTraitConf.Configuration[ck] - + data, err := json.Marshal(intTrait.Configuration) + if err != nil { + return false, err + } + intConf := make(map[string]interface{}) + err = json.Unmarshal(data, &intConf) + if err != nil { + return false, err + } + data, err = json.Marshal(kitTrait.Configuration) + if err != nil { + return false, err + } + kitConf := make(map[string]interface{}) + err = json.Unmarshal(data, &kitConf) + if err != nil { + return false, err + } + for ck, cv := range kitConf { + iv, ok := intConf[ck] if !ok { // skip it because trait configured on kit has a value that is not defined // in integration trait - return false + return false, nil } if iv != cv { // skip it because trait configured on kit has a value that differs from // the one configured on integration - return false + return false, nil } } } - return true + return true, nil } diff --git a/pkg/controller/integration/util_test.go b/pkg/controller/integration/util_test.go index 3f32dc6bcb..d6b813b47c 100644 --- a/pkg/controller/integration/util_test.go +++ b/pkg/controller/integration/util_test.go @@ -125,16 +125,12 @@ func TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T) "camel-irc", }, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, - "knative-service": { - Configuration: map[string]string{ - "enabled": "false", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), + "knative-service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "false", + }), }, }, Status: v1.IntegrationKitStatus{ @@ -163,11 +159,9 @@ func TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T) "camel-irc", }, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "false", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "false", + }), }, }, Status: v1.IntegrationKitStatus{ @@ -196,21 +190,15 @@ func TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T) "camel-irc", }, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, - "knative-service": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, - "gc": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), + "knative-service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), + "gc": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), }, }, Status: v1.IntegrationKitStatus{ @@ -239,11 +227,9 @@ func TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T) "camel-irc", }, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), }, }, Status: v1.IntegrationKitStatus{ @@ -265,16 +251,12 @@ func TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T) }, Spec: v1.IntegrationSpec{ Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, - "knative-service": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), + "knative-service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": "true", + }), }, }, Status: v1.IntegrationStatus{ diff --git a/pkg/trait/affinity.go b/pkg/trait/affinity.go index 5c65a4adad..795166fffc 100644 --- a/pkg/trait/affinity.go +++ b/pkg/trait/affinity.go @@ -19,6 +19,7 @@ package trait import ( "fmt" + "strings" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -38,17 +39,17 @@ import ( type affinityTrait struct { BaseTrait `property:",squash"` // Always co-locates multiple replicas of the integration in the same node (default *false*). - PodAffinity bool `property:"pod-affinity"` + PodAffinity bool `property:"pod-affinity" json:"podAffinity,omitempty"` // Never co-locates multiple replicas of the integration in the same node (default *false*). - PodAntiAffinity bool `property:"pod-anti-affinity"` + PodAntiAffinity bool `property:"pod-anti-affinity" json:"podAntiAffinity,omitempty"` // Defines a set of nodes the integration pod(s) are eligible to be scheduled on, based on labels on the node. - NodeAffinityLabels string `property:"node-affinity-labels"` + NodeAffinityLabels []string `property:"node-affinity-labels" json:"nodeAffinityLabels,omitempty"` // Defines a set of pods (namely those matching the label selector, relative to the given namespace) that the // integration pod(s) should be co-located with. - PodAffinityLabels string `property:"pod-affinity-labels"` + PodAffinityLabels []string `property:"pod-affinity-labels" json:"podAffinityLabels,omitempty"` // Defines a set of pods (namely those matching the label selector, relative to the given namespace) that the // integration pod(s) should not be co-located with. - PodAntiAffinityLabels string `property:"pod-anti-affinity-labels"` + PodAntiAffinityLabels []string `property:"pod-anti-affinity-labels" json:"podAntiAffinityLabels,omitempty"` } func newAffinityTrait() Trait { @@ -92,12 +93,12 @@ func (t *affinityTrait) Apply(e *Environment) (err error) { } func (t *affinityTrait) addNodeAffinity(_ *Environment, deployment *appsv1.Deployment) error { - if t.NodeAffinityLabels == "" { + if len(t.NodeAffinityLabels) == 0 { return nil } nodeSelectorRequirements := make([]corev1.NodeSelectorRequirement, 0) - selector, err := labels.Parse(t.NodeAffinityLabels) + selector, err := labels.Parse(strings.Join(t.NodeAffinityLabels, ",")) if err != nil { return err } @@ -135,13 +136,13 @@ func (t *affinityTrait) addNodeAffinity(_ *Environment, deployment *appsv1.Deplo } func (t *affinityTrait) addPodAffinity(e *Environment, deployment *appsv1.Deployment) error { - if !t.PodAffinity && t.PodAffinityLabels == "" { + if !t.PodAffinity && len(t.PodAffinityLabels) == 0 { return nil } labelSelectorRequirements := make([]metav1.LabelSelectorRequirement, 0) - if t.PodAffinityLabels != "" { - selector, err := labels.Parse(t.PodAffinityLabels) + if len(t.PodAffinityLabels) > 0 { + selector, err := labels.Parse(strings.Join(t.PodAffinityLabels, ",")) if err != nil { return err } @@ -191,13 +192,13 @@ func (t *affinityTrait) addPodAffinity(e *Environment, deployment *appsv1.Deploy } func (t *affinityTrait) addPodAntiAffinity(e *Environment, deployment *appsv1.Deployment) error { - if !t.PodAntiAffinity && t.PodAntiAffinityLabels == "" { + if !t.PodAntiAffinity && len(t.PodAntiAffinityLabels) == 0 { return nil } labelSelectorRequirements := make([]metav1.LabelSelectorRequirement, 0) - if t.PodAntiAffinityLabels != "" { - selector, err := labels.Parse(t.PodAntiAffinityLabels) + if len(t.PodAntiAffinityLabels) > 0 { + selector, err := labels.Parse(strings.Join(t.PodAntiAffinityLabels, ",")) if err != nil { return err } diff --git a/pkg/trait/affinity_test.go b/pkg/trait/affinity_test.go index 18dcf7fc98..a0e0de512a 100644 --- a/pkg/trait/affinity_test.go +++ b/pkg/trait/affinity_test.go @@ -67,7 +67,7 @@ func TestApplyEmptyAffinityLabelsDoesSucceed(t *testing.T) { func TestApplyNodeAffinityLabelsDoesSucceed(t *testing.T) { affinityTrait, environment, deployment := createNominalAffinityTest() - affinityTrait.NodeAffinityLabels = "criteria = value" + affinityTrait.NodeAffinityLabels = []string{"criteria = value"} err := affinityTrait.Apply(environment) @@ -84,7 +84,7 @@ func TestApplyNodeAffinityLabelsDoesSucceed(t *testing.T) { func TestApplyPodAntiAffinityLabelsDoesSucceed(t *testing.T) { affinityTrait, environment, deployment := createNominalAffinityTest() affinityTrait.PodAntiAffinity = true - affinityTrait.PodAntiAffinityLabels = "criteria != value" + affinityTrait.PodAntiAffinityLabels = []string{"criteria != value"} err := affinityTrait.Apply(environment) @@ -106,7 +106,7 @@ func TestApplyPodAntiAffinityLabelsDoesSucceed(t *testing.T) { func TestApplyPodAffinityLabelsDoesSucceed(t *testing.T) { affinityTrait, environment, deployment := createNominalAffinityTest() affinityTrait.PodAffinity = true - affinityTrait.PodAffinityLabels = "!criteria" + affinityTrait.PodAffinityLabels = []string{"!criteria"} err := affinityTrait.Apply(environment) diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go index ea07f8f2c7..365e99dc40 100644 --- a/pkg/trait/builder.go +++ b/pkg/trait/builder.go @@ -47,7 +47,7 @@ const builderDir = "/builder" type builderTrait struct { BaseTrait `property:",squash"` // Enable verbose logging on build components that support it (e.g. Kaniko build pod). - Verbose bool `property:"verbose"` + Verbose bool `property:"verbose" json:"verbose,omitempty"` } func newBuilderTrait() Trait { diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go index b532c073ce..4f3d15435e 100644 --- a/pkg/trait/camel.go +++ b/pkg/trait/camel.go @@ -34,7 +34,7 @@ import ( type camelTrait struct { BaseTrait `property:",squash"` // The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration Platform. - RuntimeVersion string `property:"runtime-version"` + RuntimeVersion string `property:"runtime-version" json:"runtimeVersion,omitempty"` } func newCamelTrait() Trait { diff --git a/pkg/trait/container.go b/pkg/trait/container.go index 7f45e51860..be1ea209d0 100644 --- a/pkg/trait/container.go +++ b/pkg/trait/container.go @@ -53,60 +53,60 @@ const ( type containerTrait struct { BaseTrait `property:",squash"` - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` // The minimum amount of CPU required. - RequestCPU string `property:"request-cpu"` + RequestCPU string `property:"request-cpu" json:"requestCPU,omitempty"` // The minimum amount of memory required. - RequestMemory string `property:"request-memory"` + RequestMemory string `property:"request-memory" json:"requestMemory,omitempty"` // The maximum amount of CPU required. - LimitCPU string `property:"limit-cpu"` + LimitCPU string `property:"limit-cpu" json:"limitCPU,omitempty"` // The maximum amount of memory required. - LimitMemory string `property:"limit-memory"` + LimitMemory string `property:"limit-memory" json:"limitMemory,omitempty"` // Can be used to enable/disable exposure via kubernetes Service. - Expose *bool `property:"expose"` + Expose *bool `property:"expose" json:"expose,omitempty"` // To configure a different port exposed by the container (default `8080`). - Port int `property:"port"` + Port int `property:"port" json:"port,omitempty"` // To configure a different port name for the port exposed by the container (default `http`). - PortName string `property:"port-name"` + PortName string `property:"port-name" json:"portName,omitempty"` // To configure under which service port the container port is to be exposed (default `80`). - ServicePort int `property:"service-port"` + ServicePort int `property:"service-port" json:"servicePort,omitempty"` // To configure under which service port name the container port is to be exposed (default `http`). - ServicePortName string `property:"service-port-name"` + ServicePortName string `property:"service-port-name" json:"servicePortName,omitempty"` // The main container name. It's named `integration` by default. - Name string `property:"name"` + Name string `property:"name" json:"name,omitempty"` // ProbesEnabled enable/disable probes on the container (default `false`) - ProbesEnabled bool `property:"probes-enabled"` + ProbesEnabled bool `property:"probes-enabled" json:"probesEnabled,omitempty"` // Path to access on the probe ( default `/health`). Note that this property is not supported // on quarkus runtime and setting it will result in the integration failing to start. - ProbePath string `property:"probe-path"` + ProbePath string `property:"probe-path" json:"probePath,omitempty"` // Number of seconds after the container has started before liveness probes are initiated. - LivenessInitialDelay int32 `property:"liveness-initial-delay"` + LivenessInitialDelay int32 `property:"liveness-initial-delay" json:"livenessInitialDelay,omitempty"` // Number of seconds after which the probe times out. Applies to the liveness probe. - LivenessTimeout int32 `property:"liveness-timeout"` + LivenessTimeout int32 `property:"liveness-timeout" json:"livenessTimeout,omitempty"` // How often to perform the probe. Applies to the liveness probe. - LivenessPeriod int32 `property:"liveness-period"` + LivenessPeriod int32 `property:"liveness-period" json:"livenessPeriod,omitempty"` // Minimum consecutive successes for the probe to be considered successful after having failed. // Applies to the liveness probe. - LivenessSuccessThreshold int32 `property:"liveness-success-threshold"` + LivenessSuccessThreshold int32 `property:"liveness-success-threshold" json:"livenessSuccessThreshold,omitempty"` // Minimum consecutive failures for the probe to be considered failed after having succeeded. // Applies to the liveness probe. - LivenessFailureThreshold int32 `property:"liveness-failure-threshold"` + LivenessFailureThreshold int32 `property:"liveness-failure-threshold" json:"livenessFailureThreshold,omitempty"` // Number of seconds after the container has started before readiness probes are initiated. - ReadinessInitialDelay int32 `property:"readiness-initial-delay"` + ReadinessInitialDelay int32 `property:"readiness-initial-delay" json:"readinessInitialDelay,omitempty"` // Number of seconds after which the probe times out. Applies to the readiness probe. - ReadinessTimeout int32 `property:"readiness-timeout"` + ReadinessTimeout int32 `property:"readiness-timeout" json:"readinessTimeout,omitempty"` // How often to perform the probe. Applies to the readiness probe. - ReadinessPeriod int32 `property:"readiness-period"` + ReadinessPeriod int32 `property:"readiness-period" json:"readinessPeriod,omitempty"` // Minimum consecutive successes for the probe to be considered successful after having failed. // Applies to the readiness probe. - ReadinessSuccessThreshold int32 `property:"readiness-success-threshold"` + ReadinessSuccessThreshold int32 `property:"readiness-success-threshold" json:"readinessSuccessThreshold,omitempty"` // Minimum consecutive failures for the probe to be considered failed after having succeeded. // Applies to the readiness probe. - ReadinessFailureThreshold int32 `property:"readiness-failure-threshold"` + ReadinessFailureThreshold int32 `property:"readiness-failure-threshold" json:"readinessFailureThreshold,omitempty"` } func newContainerTrait() Trait { diff --git a/pkg/trait/container_probes_test.go b/pkg/trait/container_probes_test.go index 2de98c61f6..2f9e3c66ac 100644 --- a/pkg/trait/container_probes_test.go +++ b/pkg/trait/container_probes_test.go @@ -20,15 +20,15 @@ package trait import ( "testing" + "github.com/stretchr/testify/assert" + serving "knative.dev/serving/pkg/apis/serving/v1" - "github.com/apache/camel-k/pkg/util/camel" - "github.com/apache/camel-k/pkg/util/kubernetes" appsv1 "k8s.io/api/apps/v1" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - - "github.com/stretchr/testify/assert" + "github.com/apache/camel-k/pkg/util/camel" + "github.com/apache/camel-k/pkg/util/kubernetes" ) func newTestProbesEnv(t *testing.T, provider v1.RuntimeProvider) Environment { @@ -56,10 +56,8 @@ func newTestProbesEnv(t *testing.T, provider v1.RuntimeProvider) Environment { } func newTestContainerTrait() *containerTrait { - enabled := true - tr := newContainerTrait().(*containerTrait) - tr.ProbesEnabled = enabled + tr.ProbesEnabled = true return tr } diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go index 8510fa6c58..a4610eee43 100644 --- a/pkg/trait/container_test.go +++ b/pkg/trait/container_test.go @@ -29,6 +29,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) func TestContainerWithDefaults(t *testing.T) { @@ -106,11 +107,9 @@ func TestContainerWithCustomName(t *testing.T) { Spec: v1.IntegrationSpec{ Profile: v1.TraitProfileKubernetes, Traits: map[string]v1.TraitSpec{ - "container": { - Configuration: map[string]string{ - "name": "my-container-name", - }, - }, + "container": test.TraitSpecFromMap(t, map[string]interface{}{ + "name": "my-container-name", + }), }, }, }, @@ -145,5 +144,7 @@ func TestContainerWithCustomName(t *testing.T) { assert.NotNil(t, d) assert.Len(t, d.Spec.Template.Spec.Containers, 1) - assert.Equal(t, environment.Integration.Spec.Traits["container"].Configuration["name"], d.Spec.Template.Spec.Containers[0].Name) + + trait := test.TraitSpecToMap(t, environment.Integration.Spec.Traits["container"]) + assert.Equal(t, trait["name"], d.Spec.Template.Spec.Containers[0].Name) } diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go index fd7f264717..87ff0e9d15 100644 --- a/pkg/trait/cron.go +++ b/pkg/trait/cron.go @@ -54,28 +54,28 @@ type cronTrait struct { BaseTrait `property:",squash"` // The CronJob schedule for the whole integration. If multiple routes are declared, they must have the same schedule for this // mechanism to work correctly. - Schedule string `property:"schedule"` + Schedule string `property:"schedule" json:"schedule,omitempty"` // A comma separated list of the Camel components that need to be customized in order for them to work when the schedule is triggered externally by Kubernetes. // A specific customizer is activated for each specified component. E.g. for the `timer` component, the `cron-timer` customizer is // activated (it's present in the `org.apache.camel.k:camel-k-runtime-cron` library). // // Supported components are currently: `cron`, `timer` and `quartz`. - Components string `property:"components"` + Components string `property:"components" json:"components,omitempty"` // Use the default Camel implementation of the `cron` endpoint (`quartz`) instead of trying to materialize the integration // as Kubernetes CronJob. - Fallback *bool `property:"fallback"` + Fallback *bool `property:"fallback" json:"fallback,omitempty"` // Specifies how to treat concurrent executions of a Job. // Valid values are: // - "Allow": allows CronJobs to run concurrently; // - "Forbid" (default): forbids concurrent runs, skipping next run if previous run hasn't finished yet; // - "Replace": cancels currently running job and replaces it with a new one - ConcurrencyPolicy string `property:"concurrency-policy"` + ConcurrencyPolicy string `property:"concurrency-policy" json:"concurrencyPolicy,omitempty"` // Automatically deploy the integration as CronJob when all routes are // either starting from a periodic consumer (only `cron`, `timer` and `quartz` are supported) or a passive consumer (e.g. `direct` is a passive consumer). // // It's required that all periodic consumers have the same period and it can be expressed as cron schedule (e.g. `1m` can be expressed as `0/1 * * * *`, // while `35m` or `50s` cannot). - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` } var _ ControllerStrategySelector = &cronTrait{} diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go index f3f555e20d..7e705d9fae 100644 --- a/pkg/trait/cron_test.go +++ b/pkg/trait/cron_test.go @@ -22,16 +22,17 @@ import ( "strings" "testing" - "github.com/apache/camel-k/pkg/util" + passert "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/apache/camel-k/pkg/util/camel" - k8sutils "github.com/apache/camel-k/pkg/util/kubernetes" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - passert "github.com/magiconair/properties/assert" - "github.com/stretchr/testify/assert" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util" + "github.com/apache/camel-k/pkg/util/camel" + k8sutils "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) func TestCronFromURI(t *testing.T) { @@ -319,11 +320,9 @@ func TestCronDepsFallback(t *testing.T) { }, Resources: []v1.ResourceSpec{}, Traits: map[string]v1.TraitSpec{ - "cron": { - Configuration: map[string]string{ - "fallback": "true", - }, - }, + "cron": test.TraitSpecFromMap(t, map[string]interface{}{ + "fallback": true, + }), }, }, }, @@ -396,11 +395,9 @@ func TestCronWithMain(t *testing.T) { }, Resources: []v1.ResourceSpec{}, Traits: map[string]v1.TraitSpec{ - "quarkus": { - Configuration: map[string]string{ - "enabled": "false", - }, - }, + "quarkus": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": false, + }), }, }, }, @@ -472,11 +469,9 @@ func TestCronWithQuarkus(t *testing.T) { }, Resources: []v1.ResourceSpec{}, Traits: map[string]v1.TraitSpec{ - "quarkus": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "quarkus": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + }), }, }, }, diff --git a/pkg/trait/deployer.go b/pkg/trait/deployer.go index c6f6392ac6..b3cf394eee 100644 --- a/pkg/trait/deployer.go +++ b/pkg/trait/deployer.go @@ -36,7 +36,7 @@ import ( type deployerTrait struct { BaseTrait `property:",squash"` // Allows to explicitly select the desired deployment kind between `deployment`, `cron-job` or `knative-service` when creating the resources for running the integration. - Kind string `property:"kind"` + Kind string `property:"kind" json:"kind,omitempty"` } var _ ControllerStrategySelector = &deployerTrait{} diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go index 71c44d0bc3..04c89d3a2b 100644 --- a/pkg/trait/environment.go +++ b/pkg/trait/environment.go @@ -29,7 +29,7 @@ import ( // +camel-k:trait=environment type environmentTrait struct { BaseTrait `property:",squash"` - ContainerMeta bool `property:"container-meta"` + ContainerMeta bool `property:"container-meta" json:"containerMeta,omitempty"` } const ( diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go index 016fb6084f..ad0d3be01b 100644 --- a/pkg/trait/environment_test.go +++ b/pkg/trait/environment_test.go @@ -30,6 +30,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) func TestDefaultEnvironment(t *testing.T) { @@ -117,11 +118,9 @@ func TestEnabledContainerMetaDataEnvVars(t *testing.T) { Spec: v1.IntegrationSpec{ Profile: v1.TraitProfileOpenShift, Traits: map[string]v1.TraitSpec{ - "environment": { - Configuration: map[string]string{ - "container-meta": "true", - }, - }, + "environment": test.TraitSpecFromMap(t, map[string]interface{}{ + "containerMeta": true, + }), }, }, }, @@ -185,11 +184,9 @@ func TestDisabledContainerMetaDataEnvVars(t *testing.T) { Spec: v1.IntegrationSpec{ Profile: v1.TraitProfileOpenShift, Traits: map[string]v1.TraitSpec{ - "environment": { - Configuration: map[string]string{ - "container-meta": "false", - }, - }, + "environment": test.TraitSpecFromMap(t, map[string]interface{}{ + "containerMeta": false, + }), }, }, }, diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go index bcd3e43cab..9c8380ba78 100644 --- a/pkg/trait/gc.go +++ b/pkg/trait/gc.go @@ -63,7 +63,7 @@ const ( type garbageCollectorTrait struct { BaseTrait `property:",squash"` // Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`) - DiscoveryCache *discoveryCacheType `property:"discovery-cache"` + DiscoveryCache *discoveryCacheType `property:"discovery-cache" json:"discoveryCache,omitempty"` } func newGarbageCollectorTrait() Trait { diff --git a/pkg/trait/ingress.go b/pkg/trait/ingress.go index fc8b737b59..9ecb4aa227 100644 --- a/pkg/trait/ingress.go +++ b/pkg/trait/ingress.go @@ -39,9 +39,9 @@ import ( type ingressTrait struct { BaseTrait `property:",squash"` // **Required**. To configure the host exposed by the ingress. - Host string `property:"host"` + Host string `property:"host" json:"host,omitempty"` // To automatically add an ingress whenever the integration uses a HTTP endpoint consumer. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` } func newIngressTrait() Trait { diff --git a/pkg/trait/istio.go b/pkg/trait/istio.go index 441d92eb95..2c26a60447 100644 --- a/pkg/trait/istio.go +++ b/pkg/trait/istio.go @@ -34,9 +34,9 @@ import ( type istioTrait struct { BaseTrait `property:",squash"` // Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). - Allow string `property:"allow"` + Allow string `property:"allow" json:"allow,omitempty"` // Forces the value for labels `sidecar.istio.io/inject`. By default the label is set to `true` on deployment and not set on Knative Service. - Inject *bool `property:"inject"` + Inject *bool `property:"inject" json:"inject,omitempty"` } const ( diff --git a/pkg/trait/istio_test.go b/pkg/trait/istio_test.go index 20c12d5e60..db4a915f0d 100644 --- a/pkg/trait/istio_test.go +++ b/pkg/trait/istio_test.go @@ -31,6 +31,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) func NewIstioTestEnv(t *testing.T, d *appsv1.Deployment, s *serving.Service, enabled bool) Environment { @@ -45,11 +46,7 @@ func NewIstioTestEnv(t *testing.T, d *appsv1.Deployment, s *serving.Service, ena Phase: v1.IntegrationPhaseDeploying, }, Spec: v1.IntegrationSpec{ - Traits: map[string]v1.TraitSpec{ - "istio": { - Configuration: make(map[string]string), - }, - }, + Traits: make(map[string]v1.TraitSpec), }, }, Platform: &v1.IntegrationPlatform{ @@ -67,7 +64,9 @@ func NewIstioTestEnv(t *testing.T, d *appsv1.Deployment, s *serving.Service, ena env.Platform.ResyncStatusFullConfig() if enabled { - env.Integration.Spec.Traits["istio"].Configuration["enabled"] = "true" + env.Integration.Spec.Traits["istio"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + }) } return env @@ -110,7 +109,10 @@ func TestIstioForcedInjectTrue(t *testing.T) { } env := NewIstioTestEnv(t, &d, &s, true) - env.Integration.Spec.Traits["istio"].Configuration["inject"] = "true" + env.Integration.Spec.Traits["istio"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "inject": true, + }) err := env.Catalog.apply(&env) assert.Nil(t, err) @@ -134,7 +136,10 @@ func TestIstioForcedInjectFalse(t *testing.T) { } env := NewIstioTestEnv(t, &d, &s, true) - env.Integration.Spec.Traits["istio"].Configuration["inject"] = "false" + env.Integration.Spec.Traits["istio"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "inject": false, + }) err := env.Catalog.apply(&env) assert.Nil(t, err) diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go index 3d564ecfa6..8363bbbf07 100644 --- a/pkg/trait/jolokia.go +++ b/pkg/trait/jolokia.go @@ -38,35 +38,33 @@ type jolokiaTrait struct { // The PEM encoded CA certification file path, used to verify client certificates, // applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` // (default `/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt` for OpenShift). - CaCert *string `property:"ca-cert"` + CaCert *string `property:"ca-cert" json:"CACert,omitempty"` // The principal(s) which must be given in a client certificate to allow access to the Jolokia endpoint, // applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` // (default `clientPrincipal=cn=system:master-proxy`, `cn=hawtio-online.hawtio.svc` and `cn=fuse-console.fuse.svc` for OpenShift). - ClientPrincipal []string `property:"client-principal"` + ClientPrincipal []string `property:"client-principal" json:"clientPrincipal,omitempty"` // Listen for multicast requests (default `false`) - DiscoveryEnabled *bool `property:"discovery-enabled"` + DiscoveryEnabled *bool `property:"discovery-enabled" json:"discoveryEnabled,omitempty"` // Mandate the client certificate contains a client flag in the extended key usage section, // applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` // (default `true` for OpenShift). - ExtendedClientCheck *bool `property:"extended-client-check"` + ExtendedClientCheck *bool `property:"extended-client-check" json:"extendedClientCheck,omitempty"` // The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, // the servers binds to every network interface (default `"*"`). - Host *string `property:"host"` + Host *string `property:"host" json:"host,omitempty"` // The password used for authentication, applicable when the `user` option is set. - Password *string `property:"password"` + Password *string `property:"password" json:"password,omitempty"` // The Jolokia endpoint port (default `8778`). - Port int `property:"port"` + Port int `property:"port" json:"port,omitempty"` // The protocol to use, either `http` or `https` (default `https` for OpenShift) - Protocol *string `property:"protocol"` + Protocol *string `property:"protocol" json:"protocol,omitempty"` // The user to be used for authentication - User *string `property:"user"` + User *string `property:"user" json:"user,omitempty"` // Whether client certificates should be used for authentication (default `true` for OpenShift). - UseSslClientAuthentication *bool `property:"use-ssl-client-authentication"` - - // A comma-separated list of additional Jolokia options as defined - // in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], - // e.g.: `keystore=...,executor=...` - Options *string `property:"options"` + UseSslClientAuthentication *bool `property:"use-ssl-client-authentication" json:"useSSLClientAuthentication,omitempty"` + // A list of additional Jolokia options as defined + // in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options] + Options []string `property:"options" json:"options,omitempty"` } func newJolokiaTrait() Trait { @@ -105,26 +103,21 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) { } // Configure the Jolokia Java agent, first with the extra options - options, err := parseCsvMap(t.Options) + options, err := keyValuePairArrayAsStringMap(t.Options) if err != nil { return err } - if len(t.ClientPrincipal) == 1 { - // Work-around the lack of proper support for multi-valued trait options from the CLI - t.ClientPrincipal = strings.Split(t.ClientPrincipal[0], ",") - } - - setDefaultJolokiaOption(options, &t.Host, "host", "*") - setDefaultJolokiaOption(options, &t.DiscoveryEnabled, "discoveryEnabled", false) + t.setDefaultJolokiaOption(options, &t.Host, "host", "*") + t.setDefaultJolokiaOption(options, &t.DiscoveryEnabled, "discoveryEnabled", false) // Configure HTTPS by default for OpenShift if e.DetermineProfile() == v1.TraitProfileOpenShift { - setDefaultJolokiaOption(options, &t.Protocol, "protocol", "https") - setDefaultJolokiaOption(options, &t.CaCert, "caCert", "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt") - setDefaultJolokiaOption(options, &t.ExtendedClientCheck, "extendedClientCheck", true) - setDefaultJolokiaOption(options, &t.UseSslClientAuthentication, "useSslClientAuthentication", true) - setDefaultJolokiaOption(options, &t.ClientPrincipal, "clientPrincipal", []string{ + t.setDefaultJolokiaOption(options, &t.Protocol, "protocol", "https") + t.setDefaultJolokiaOption(options, &t.CaCert, "caCert", "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt") + t.setDefaultJolokiaOption(options, &t.ExtendedClientCheck, "extendedClientCheck", true) + t.setDefaultJolokiaOption(options, &t.UseSslClientAuthentication, "useSslClientAuthentication", true) + t.setDefaultJolokiaOption(options, &t.ClientPrincipal, "clientPrincipal", []string{ // Master API proxy for OpenShift 3 "cn=system:master-proxy", // Default Hawtio and Fuse consoles for OpenShift 4 @@ -134,16 +127,16 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) { } // Then add explicitly set trait configuration properties - addToJolokiaOptions(options, "caCert", t.CaCert) - addToJolokiaOptions(options, "clientPrincipal", t.ClientPrincipal) - addToJolokiaOptions(options, "discoveryEnabled", t.DiscoveryEnabled) - addToJolokiaOptions(options, "extendedClientCheck", t.ExtendedClientCheck) - addToJolokiaOptions(options, "host", t.Host) - addToJolokiaOptions(options, "password", t.Password) - addToJolokiaOptions(options, "port", t.Port) - addToJolokiaOptions(options, "protocol", t.Protocol) - addToJolokiaOptions(options, "user", t.User) - addToJolokiaOptions(options, "useSslClientAuthentication", t.UseSslClientAuthentication) + t.addToJolokiaOptions(options, "caCert", t.CaCert) + t.addToJolokiaOptions(options, "clientPrincipal", t.ClientPrincipal) + t.addToJolokiaOptions(options, "discoveryEnabled", t.DiscoveryEnabled) + t.addToJolokiaOptions(options, "extendedClientCheck", t.ExtendedClientCheck) + t.addToJolokiaOptions(options, "host", t.Host) + t.addToJolokiaOptions(options, "password", t.Password) + t.addToJolokiaOptions(options, "port", t.Port) + t.addToJolokiaOptions(options, "protocol", t.Protocol) + t.addToJolokiaOptions(options, "user", t.User) + t.addToJolokiaOptions(options, "useSslClientAuthentication", t.UseSslClientAuthentication) // Options must be sorted so that the environment variable value is consistent over iterations, // otherwise the value changes which results in triggering a new deployment. @@ -172,7 +165,7 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) { return nil } -func setDefaultJolokiaOption(options map[string]string, option interface{}, key string, value interface{}) { +func (t *jolokiaTrait) setDefaultJolokiaOption(options map[string]string, option interface{}, key string, value interface{}) { // Do not override existing option if _, ok := options[key]; ok { return @@ -200,7 +193,7 @@ func setDefaultJolokiaOption(options map[string]string, option interface{}, key } } -func addToJolokiaOptions(options map[string]string, key string, value interface{}) { +func (t *jolokiaTrait) addToJolokiaOptions(options map[string]string, key string, value interface{}) { switch v := value.(type) { case *bool: if v != nil { diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go index 928832d4cd..ea7bca6bc4 100644 --- a/pkg/trait/jolokia_test.go +++ b/pkg/trait/jolokia_test.go @@ -111,14 +111,15 @@ func TestApplyJolokiaTraitWithoutContainerShouldReportJolokiaUnavailable(t *test func TestApplyJolokiaTraitWithOptionShouldOverrideDefault(t *testing.T) { trait, environment := createNominalJolokiaTest() - options := "host=explicit-host," + - "discoveryEnabled=true," + - "protocol=http," + - "caCert=.cacert," + - "extendedClientCheck=false," + - "clientPrincipal=cn:any," + - "useSslClientAuthentication=false" - trait.Options = &options + trait.Options = []string{ + "host=explicit-host", + "discoveryEnabled=true", + "protocol=http", + "caCert=.cacert", + "extendedClientCheck=false", + "clientPrincipal=cn:any", + "useSslClientAuthentication=false", + } err := trait.Apply(environment) @@ -135,107 +136,132 @@ func TestApplyJolokiaTraitWithOptionShouldOverrideDefault(t *testing.T) { func TestApplyJolokiaTraitWithUnparseableOptionShouldReturnError(t *testing.T) { trait, environment := createNominalJolokiaTest() - options := "unparseable options" - trait.Options = &options + trait.Options = []string{"unparseable options"} err := trait.Apply(environment) assert.NotNil(t, err) } -func TestSetDefaultJolokiaOptionShoudlNotOverrideOptionsMap(t *testing.T) { +func TestSetDefaultJolokiaOptionShouldNotOverrideOptionsMap(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{"key": "value"} optionValue := "" - setDefaultJolokiaOption(options, &optionValue, "key", "new-value") + + trait.setDefaultJolokiaOption(options, &optionValue, "key", "new-value") + assert.Equal(t, "", optionValue) } -func TestSetDefaultStringJolokiaOptionShoudlSucceed(t *testing.T) { +func TestSetDefaultStringJolokiaOptionShouldSucceed(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} var option *string - setDefaultJolokiaOption(options, &option, "key", "new-value") + + trait.setDefaultJolokiaOption(options, &option, "key", "new-value") + assert.Equal(t, "new-value", *option) } -func TestSetDefaultStringJolokiaOptionShoudlNotOverrideExistingValue(t *testing.T) { +func TestSetDefaultStringJolokiaOptionShouldNotOverrideExistingValue(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} optionValue := "existing-value" option := &optionValue - setDefaultJolokiaOption(options, &option, "key", "new-value") + + trait.setDefaultJolokiaOption(options, &option, "key", "new-value") + assert.Equal(t, "existing-value", *option) } -func TestSetDefaultIntJolokiaOptionShoudlSucceed(t *testing.T) { +func TestSetDefaultIntJolokiaOptionShouldSucceed(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} var option *int - setDefaultJolokiaOption(options, &option, "key", 2) + + trait.setDefaultJolokiaOption(options, &option, "key", 2) + assert.Equal(t, 2, *option) } -func TestSetDefaultIntJolokiaOptionShoudlNotOverrideExistingValue(t *testing.T) { +func TestSetDefaultIntJolokiaOptionShouldNotOverrideExistingValue(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} optionValue := 1 option := &optionValue - setDefaultJolokiaOption(options, &option, "key", 2) + + trait.setDefaultJolokiaOption(options, &option, "key", 2) + assert.Equal(t, 1, *option) } -func TestSetDefaultBoolJolokiaOptionShoudlSucceed(t *testing.T) { +func TestSetDefaultBoolJolokiaOptionShouldSucceed(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} var option *bool - setDefaultJolokiaOption(options, &option, "key", true) + + trait.setDefaultJolokiaOption(options, &option, "key", true) + assert.Equal(t, true, *option) } -func TestSetDefaultBoolJolokiaOptionShoudlNotOverrideExistingValue(t *testing.T) { +func TestSetDefaultBoolJolokiaOptionShouldNotOverrideExistingValue(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} option := new(bool) - setDefaultJolokiaOption(options, &option, "key", true) + + trait.setDefaultJolokiaOption(options, &option, "key", true) + assert.Equal(t, false, *option) } func TestAddStringOptionToJolokiaOptions(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} optionValue := "value" - addToJolokiaOptions(options, "key", &optionValue) + trait.addToJolokiaOptions(options, "key", &optionValue) assert.Len(t, options, 1) assert.Equal(t, "value", options["key"]) } func TestAddIntOptionToJolokiaOptions(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} - addToJolokiaOptions(options, "key", 1) + trait.addToJolokiaOptions(options, "key", 1) assert.Len(t, options, 1) assert.Equal(t, "1", options["key"]) } func TestAddIntPointerOptionToJolokiaOptions(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} optionValue := 1 - addToJolokiaOptions(options, "key", &optionValue) + trait.addToJolokiaOptions(options, "key", &optionValue) assert.Len(t, options, 1) assert.Equal(t, "1", options["key"]) } func TestAddBoolPointerOptionToJolokiaOptions(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} - addToJolokiaOptions(options, "key", new(bool)) + trait.addToJolokiaOptions(options, "key", new(bool)) assert.Len(t, options, 1) assert.Equal(t, "false", options["key"]) } func TestAddWrongTypeOptionToJolokiaOptionsDoesNothing(t *testing.T) { + trait := newJolokiaTrait().(*jolokiaTrait) options := map[string]string{} - addToJolokiaOptions(options, "key", new(rune)) + trait.addToJolokiaOptions(options, "key", new(rune)) assert.Len(t, options, 0) } diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go index 110510a4d9..91dc8d7986 100644 --- a/pkg/trait/jvm.go +++ b/pkg/trait/jvm.go @@ -33,6 +33,7 @@ import ( k8sclient "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util" ) // The JVM trait is used to configure the JVM that runs the integration. @@ -41,15 +42,15 @@ import ( type jvmTrait struct { BaseTrait `property:",squash"` // Activates remote debugging, so that a debugger can be attached to the JVM, e.g., using port-forwarding - Debug bool `property:"debug"` + Debug bool `property:"debug" json:"debug,omitempty"` // Suspends the target JVM immediately before the main class is loaded - DebugSuspend bool `property:"debug-suspend"` + DebugSuspend bool `property:"debug-suspend" json:"debugSuspend,omitempty"` // Prints the command used the start the JVM in the container logs (default `true`) - PrintCommand bool `property:"print-command"` + PrintCommand bool `property:"print-command" json:"printCommand,omitempty"` // Transport address at which to listen for the newly launched JVM (default `*:5005`) - DebugAddress string `property:"debug-address"` - // A comma-separated list of JVM options - Options *string `property:"options"` + DebugAddress string `property:"debug-address" json:"debugAddress,omitempty"` + // A list of JVM options + Options []string `property:"options" json:"options,omitempty"` } func newJvmTrait() Trait { @@ -129,13 +130,10 @@ func (t *jvmTrait) Apply(e *Environment) error { hasHeapSizeOption := false // Add JVM options - if t.Options != nil { - hasHeapSizeOption = strings.Contains(*t.Options, "-Xmx") || - strings.Contains(*t.Options, "-XX:MaxHeapSize") || - strings.Contains(*t.Options, "-XX:MinRAMPercentage") || - strings.Contains(*t.Options, "-XX:MaxRAMPercentage") + if len(t.Options) > 0 { + hasHeapSizeOption = util.StringSliceContainsAnyOf(t.Options, "-Xmx", "-XX:MaxHeapSize", "-XX:MinRAMPercentage", "-XX:MaxRAMPercentage") - args = append(args, strings.Split(*t.Options, ",")...) + args = append(args, t.Options...) } // Tune JVM maximum heap size based on the container memory limit, if any. diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go index ae5d8c7360..0a56b49b72 100644 --- a/pkg/trait/knative.go +++ b/pkg/trait/knative.go @@ -21,18 +21,20 @@ import ( "net/url" "strings" - "github.com/apache/camel-k/pkg/util" + "github.com/pkg/errors" + + corev1 "k8s.io/api/core/v1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + + eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1" + serving "knative.dev/serving/pkg/apis/serving/v1" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" knativeapi "github.com/apache/camel-k/pkg/apis/camel/v1/knative" "github.com/apache/camel-k/pkg/metadata" + "github.com/apache/camel-k/pkg/util" "github.com/apache/camel-k/pkg/util/envvar" knativeutil "github.com/apache/camel-k/pkg/util/knative" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - k8serrors "k8s.io/apimachinery/pkg/api/errors" - eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1" - serving "knative.dev/serving/pkg/apis/serving/v1" ) // The Knative trait automatically discovers addresses of Knative resources and inject them into the @@ -47,32 +49,32 @@ import ( type knativeTrait struct { BaseTrait `property:",squash"` // Can be used to inject a Knative complete configuration in JSON format. - Configuration string `property:"configuration"` - // Comma-separated list of channels used as source of integration routes. + Configuration string `property:"configuration" json:"configuration,omitempty"` + // List of channels used as source of integration routes. // Can contain simple channel names or full Camel URIs. - ChannelSources string `property:"channel-sources"` - // Comma-separated list of channels used as destination of integration routes. + ChannelSources []string `property:"channel-sources" json:"channelSources,omitempty"` + // List of channels used as destination of integration routes. // Can contain simple channel names or full Camel URIs. - ChannelSinks string `property:"channel-sinks"` - // Comma-separated list of channels used as source of integration routes. - EndpointSources string `property:"endpoint-sources"` - // Comma-separated list of endpoints used as destination of integration routes. + ChannelSinks []string `property:"channel-sinks" json:"channelSinks,omitempty"` + // List of channels used as source of integration routes. + EndpointSources []string `property:"endpoint-sources" json:"endpointSources,omitempty"` + // List of endpoints used as destination of integration routes. // Can contain simple endpoint names or full Camel URIs. - EndpointSinks string `property:"endpoint-sinks"` - // Comma-separated list of event types that the integration will be subscribed to. + EndpointSinks []string `property:"endpoint-sinks" json:"endpointSinks,omitempty"` + // List of event types that the integration will be subscribed to. // Can contain simple event types or full Camel URIs (to use a specific broker different from "default"). - EventSources string `property:"event-sources"` - // Comma-separated list of event types that the integration will produce. + EventSources []string `property:"event-sources" json:"eventSources,omitempty"` + // List of event types that the integration will produce. // Can contain simple event types or full Camel URIs (to use a specific broker). - EventSinks string `property:"event-sinks"` + EventSinks []string `property:"event-sinks" json:"eventSinks,omitempty"` // Enables filtering on events based on the header "ce-knativehistory". Since this is an experimental header // that can be removed in a future version of Knative, filtering is enabled only when the integration is // listening from more than 1 channel. - FilterSourceChannels *bool `property:"filter-source-channels"` + FilterSourceChannels *bool `property:"filter-source-channels" json:"filterSourceChannels,omitempty"` // Enables Knative CamelSource pre 0.15 compatibility fixes (will be removed in future versions). - CamelSourceCompat *bool `property:"camel-source-compat"` + CamelSourceCompat *bool `property:"camel-source-compat" json:"camelSourceCompat,omitempty"` // Enable automatic discovery of all trait properties. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` } const ( @@ -102,7 +104,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { } if t.Auto == nil || *t.Auto { - if t.ChannelSources == "" { + if len(t.ChannelSources) == 0 { items := make([]string, 0) metadata.Each(e.CamelCatalog, e.Integration.Sources(), func(_ int, meta metadata.IntegrationMetadata) bool { @@ -110,9 +112,9 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { return true }) - t.ChannelSources = strings.Join(items, ",") + t.ChannelSources = items } - if t.ChannelSinks == "" { + if len(t.ChannelSinks) == 0 { items := make([]string, 0) metadata.Each(e.CamelCatalog, e.Integration.Sources(), func(_ int, meta metadata.IntegrationMetadata) bool { @@ -120,9 +122,9 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { return true }) - t.ChannelSinks = strings.Join(items, ",") + t.ChannelSinks = items } - if t.EndpointSources == "" { + if len(t.EndpointSources) == 0 { items := make([]string, 0) metadata.Each(e.CamelCatalog, e.Integration.Sources(), func(_ int, meta metadata.IntegrationMetadata) bool { @@ -130,9 +132,9 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { return true }) - t.EndpointSources = strings.Join(items, ",") + t.EndpointSources = items } - if t.EndpointSinks == "" { + if len(t.EndpointSinks) == 0 { items := make([]string, 0) metadata.Each(e.CamelCatalog, e.Integration.Sources(), func(_ int, meta metadata.IntegrationMetadata) bool { @@ -140,9 +142,9 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { return true }) - t.EndpointSinks = strings.Join(items, ",") + t.EndpointSinks = items } - if t.EventSources == "" { + if len(t.EventSources) == 0 { items := make([]string, 0) metadata.Each(e.CamelCatalog, e.Integration.Sources(), func(_ int, meta metadata.IntegrationMetadata) bool { @@ -150,9 +152,9 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { return true }) - t.EventSources = strings.Join(items, ",") + t.EventSources = items } - if t.EventSinks == "" { + if len(t.EventSinks) == 0 { items := make([]string, 0) metadata.Each(e.CamelCatalog, e.Integration.Sources(), func(_ int, meta metadata.IntegrationMetadata) bool { @@ -160,9 +162,9 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) { return true }) - t.EventSinks = strings.Join(items, ",") + t.EventSinks = items } - if len(strings.Split(t.ChannelSources, ",")) > 1 { + if len(t.ChannelSources) > 1 { // Always filter channels when the integration subscribes to more than one // Using Knative experimental header: https://github.com/knative/eventing/blob/7df0cc56c28d58223ff25d5ddfb487fa8c29a004/pkg/provisioners/message.go#L28 // TODO: filter automatically all source channels when the feature becomes stable @@ -395,24 +397,23 @@ func (t *knativeTrait) createTrigger(e *Environment, ref *corev1.ObjectReference func (t *knativeTrait) ifServiceMissingDo( e *Environment, env *knativeapi.CamelEnvironment, - serviceURIsAsString string, + serviceURIs []string, serviceType knativeapi.CamelServiceType, endpointKind knativeapi.CamelEndpointKind, gen func(ref *corev1.ObjectReference, url *url.URL, serviceURI string) error) error { - return t.withServiceDo(true, e, env, serviceURIsAsString, serviceType, endpointKind, gen) + return t.withServiceDo(true, e, env, serviceURIs, serviceType, endpointKind, gen) } func (t *knativeTrait) withServiceDo( skipDuplicates bool, e *Environment, env *knativeapi.CamelEnvironment, - serviceURIsAsString string, + serviceURIs []string, serviceType knativeapi.CamelServiceType, endpointKind knativeapi.CamelEndpointKind, gen func(ref *corev1.ObjectReference, url *url.URL, serviceURI string) error) error { - serviceURIs := t.extractServices(serviceURIsAsString, serviceType) - for _, serviceURI := range serviceURIs { + for _, serviceURI := range t.extractServices(serviceURIs, serviceType) { ref, err := knativeutil.ExtractObjectReference(serviceURI) if err != nil { return err @@ -440,9 +441,9 @@ func (t *knativeTrait) withServiceDo( return nil } -func (t *knativeTrait) extractServices(names string, serviceType knativeapi.CamelServiceType) []string { +func (t *knativeTrait) extractServices(names []string, serviceType knativeapi.CamelServiceType) []string { answer := make([]string, 0) - for _, item := range strings.Split(names, ",") { + for _, item := range names { i := strings.Trim(item, " \t\"") if i != "" { i = knativeutil.NormalizeToURI(serviceType, i) diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go index ed84f5d68a..2a5b15c4e7 100644 --- a/pkg/trait/knative_service.go +++ b/pkg/trait/knative_service.go @@ -51,30 +51,30 @@ type knativeServiceTrait struct { // Configures the Knative autoscaling class property (e.g. to set `hpa.autoscaling.knative.dev` or `kpa.autoscaling.knative.dev` autoscaling). // // Refer to the Knative documentation for more information. - Class string `property:"autoscaling-class"` + Class string `property:"autoscaling-class" json:"class,omitempty"` // Configures the Knative autoscaling metric property (e.g. to set `concurrency` based or `cpu` based autoscaling). // // Refer to the Knative documentation for more information. - Metric string `property:"autoscaling-metric"` + Metric string `property:"autoscaling-metric" json:"autoscalingMetric,omitempty"` // Sets the allowed concurrency level or CPU percentage (depending on the autoscaling metric) for each Pod. // // Refer to the Knative documentation for more information. - Target *int `property:"autoscaling-target"` + Target *int `property:"autoscaling-target" json:"autoscalingTarget,omitempty"` // The minimum number of Pods that should be running at any time for the integration. It's **zero** by default, meaning that // the integration is scaled down to zero when not used for a configured amount of time. // // Refer to the Knative documentation for more information. - MinScale *int `property:"min-scale"` + MinScale *int `property:"min-scale" json:"minScale,omitempty"` // An upper bound for the number of Pods that can be running in parallel for the integration. // Knative has its own cap value that depends on the installation. // // Refer to the Knative documentation for more information. - MaxScale *int `property:"max-scale"` + MaxScale *int `property:"max-scale" json:"maxScale,omitempty"` // Automatically deploy the integration as Knative service when all conditions hold: // // * Integration is using the Knative profile // * All routes are either starting from a HTTP based consumer or a passive consumer (e.g. `direct` is a passive consumer) - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` } var _ ControllerStrategySelector = &knativeServiceTrait{} diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go index 7988828cb8..dcf0f65bd2 100644 --- a/pkg/trait/knative_service_test.go +++ b/pkg/trait/knative_service_test.go @@ -84,11 +84,9 @@ func TestKnativeService(t *testing.T) { {Type: "property", Value: "my-property=my-property-value"}, }, Traits: map[string]v1.TraitSpec{ - "knative-service": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "knative-service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + }), }, }, }, @@ -198,22 +196,16 @@ func TestKnativeServiceWithCustomContainerName(t *testing.T) { Spec: v1.IntegrationSpec{ Profile: v1.TraitProfileKnative, Traits: map[string]v1.TraitSpec{ - "deployer": { - Configuration: map[string]string{ - "kind": "knative-service", - }, - }, - "knative-service": { - Configuration: map[string]string{ - "enabled": "true", - "auto": "false", - }, - }, - "container": { - Configuration: map[string]string{ - "name": "my-container-name", - }, - }, + "deployer": test.TraitSpecFromMap(t, map[string]interface{}{ + "kind": "knative-service", + }), + "knative-service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "auto": false, + }), + "container": test.TraitSpecFromMap(t, map[string]interface{}{ + "name": "my-container-name", + }), }, }, }, @@ -249,9 +241,11 @@ func TestKnativeServiceWithCustomContainerName(t *testing.T) { }) assert.NotNil(t, s) + + trait := test.TraitSpecToMap(t, environment.Integration.Spec.Traits["container"]) assert.Equal( t, - environment.Integration.Spec.Traits["container"].Configuration["name"], + trait["name"], s.Spec.ConfigurationSpec.Template.Spec.Containers[0].Name, ) } diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go index c9ebaddf1b..240621d4d1 100644 --- a/pkg/trait/knative_test.go +++ b/pkg/trait/knative_test.go @@ -21,13 +21,12 @@ import ( "context" "testing" - eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1" - "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + eventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1" messaging "knative.dev/eventing/pkg/apis/messaging/v1alpha1" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" @@ -66,18 +65,16 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) { Sources: []v1.SourceSpec{}, Resources: []v1.ResourceSpec{}, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - "auto": "false", - "channel-sources": "channel-source-1", - "channel-sinks": "channel-sink-1", - "endpoint-sources": "endpoint-source-1", - "endpoint-sinks": "endpoint-sink-1,endpoint-sink-2", - "event-sources": "knative:event", - "event-sinks": "knative:event", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "auto": false, + "channelSources": []string{"channel-source-1"}, + "channelSinks": []string{"channel-sink-1"}, + "endpointSources": []string{"endpoint-source-1"}, + "endpointSinks": []string{"endpoint-sink-1", "endpoint-sink-2"}, + "eventSources": []string{"knative:event"}, + "eventSinks": []string{"knative:event"}, + }), }, }, }, @@ -188,11 +185,9 @@ func TestKnativeEnvConfigurationFromSource(t *testing.T) { }, Resources: []v1.ResourceSpec{}, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + }), }, }, }, @@ -367,11 +362,9 @@ func NewFakeEnvironment(t *testing.T, source v1.SourceSpec) Environment { }, Resources: []v1.ResourceSpec{}, Traits: map[string]v1.TraitSpec{ - "knative": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, + "knative": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + }), }, }, }, diff --git a/pkg/trait/owner.go b/pkg/trait/owner.go index 84236b8f5e..c821e02646 100644 --- a/pkg/trait/owner.go +++ b/pkg/trait/owner.go @@ -18,13 +18,11 @@ limitations under the License. package trait import ( - "strings" - - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" serving "knative.dev/serving/pkg/apis/serving/v1" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" ) // The Owner trait ensures that all created resources belong to the integration being created @@ -33,10 +31,10 @@ import ( // +camel-k:trait=owner type ownerTrait struct { BaseTrait `property:",squash"` - // The annotations to be transferred (A comma-separated list of label keys) - TargetAnnotations string `property:"target-annotations"` - // The labels to be transferred (A comma-separated list of label keys) - TargetLabels string `property:"target-labels"` + // The set of annotations to be transferred + TargetAnnotations []string `property:"target-annotations" json:"targetAnnotations,omitempty"` + // The set of labels to be transferred + TargetLabels []string `property:"target-labels" json:"targetLabels,omitempty"` } func newOwnerTrait() Trait { @@ -63,7 +61,7 @@ func (t *ownerTrait) Apply(e *Environment) error { targetLabels := make(map[string]string) if e.Integration.Labels != nil { - for _, k := range strings.Split(t.TargetLabels, ",") { + for _, k := range t.TargetLabels { if v, ok := e.Integration.Labels[k]; ok { targetLabels[k] = v } @@ -72,7 +70,7 @@ func (t *ownerTrait) Apply(e *Environment) error { targetAnnotations := make(map[string]string) if e.Integration.Annotations != nil { - for _, k := range strings.Split(t.TargetAnnotations, ",") { + for _, k := range t.TargetAnnotations { if v, ok := e.Integration.Annotations[k]; ok { targetAnnotations[k] = v } diff --git a/pkg/trait/owner_test.go b/pkg/trait/owner_test.go index f0c42a289c..c5f59057c9 100644 --- a/pkg/trait/owner_test.go +++ b/pkg/trait/owner_test.go @@ -20,12 +20,13 @@ package trait import ( "testing" - v1 "github.com/apache/camel-k/pkg/apis/camel/v1" - "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/util/test" ) func TestOwner(t *testing.T) { @@ -42,12 +43,10 @@ func TestOwner(t *testing.T) { func SetUpOwnerEnvironment(t *testing.T) *Environment { env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift, "camel:core") env.Integration.Spec.Traits = map[string]v1.TraitSpec{ - "owner": { - Configuration: map[string]string{ - "target-labels": "com.mycompany/mylabel1", - "target-annotations": "com.mycompany/myannotation2", - }, - }, + "owner": test.TraitSpecFromMap(t, map[string]interface{}{ + "targetLabels": []string{"com.mycompany/mylabel1"}, + "targetAnnotations": []string{"com.mycompany/myannotation2"}, + }), } env.Integration.SetLabels(map[string]string{ diff --git a/pkg/trait/platform.go b/pkg/trait/platform.go index 9db375f120..6e55d91a0e 100644 --- a/pkg/trait/platform.go +++ b/pkg/trait/platform.go @@ -34,9 +34,9 @@ import ( type platformTrait struct { BaseTrait `property:",squash"` // To create a default (empty) platform when the platform is missing. - CreateDefault *bool `property:"create-default"` + CreateDefault *bool `property:"create-default" json:"createDefault,omitempty"` // To automatically detect from the environment if a default platform can be created (it will be created on OpenShift only). - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` } func newPlatformTrait() Trait { diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go index ecee2a23bb..385be51f3b 100644 --- a/pkg/trait/prometheus.go +++ b/pkg/trait/prometheus.go @@ -51,15 +51,15 @@ import ( type prometheusTrait struct { BaseTrait `property:",squash"` // The Prometheus endpoint port (default `9779`, or `8080` with Quarkus). - Port *int `property:"port"` + Port *int `property:"port" json:"port,omitempty"` // Whether a `ServiceMonitor` resource is created (default `true`). - ServiceMonitor bool `property:"service-monitor"` + ServiceMonitor bool `property:"service-monitor" json:"serviceMonitor,omitempty"` // The `ServiceMonitor` resource labels, applicable when `service-monitor` is `true`. - ServiceMonitorLabels string `property:"service-monitor-labels"` + ServiceMonitorLabels []string `property:"service-monitor-labels" json:"serviceMonitorLabels,omitempty"` // To use a custom ConfigMap containing the Prometheus JMX exporter configuration (under the `content` ConfigMap key). // When this property is left empty (default), Camel K generates a standard Prometheus configuration for the integration. // It is not applicable when using Quarkus. - ConfigMap string `property:"configmap"` + ConfigMap string `property:"configmap" json:"configMap,omitempty"` } const ( @@ -218,7 +218,7 @@ func (t *prometheusTrait) getServicePort() *corev1.ServicePort { } func (t *prometheusTrait) getServiceMonitorFor(e *Environment) (*monitoringv1.ServiceMonitor, error) { - labels, err := parseCsvMap(&t.ServiceMonitorLabels) + labels, err := keyValuePairArrayAsStringMap(t.ServiceMonitorLabels) if err != nil { return nil, err } diff --git a/pkg/trait/pull_secret.go b/pkg/trait/pull_secret.go index 57fe0daba2..c4e44e9e2b 100644 --- a/pkg/trait/pull_secret.go +++ b/pkg/trait/pull_secret.go @@ -38,9 +38,9 @@ import ( type pullSecretTrait struct { BaseTrait `property:",squash"` // The pull secret name to set on the Pod. If left empty this is automatically taken from the `IntegrationPlatform` registry configuration. - SecretName string `property:"secret-name"` + SecretName string `property:"secret-name" json:"secretName,omitempty"` // Automatically configures the platform registry secret on the pod if it is of type `kubernetes.io/dockerconfigjson`. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` } func newPullSecretTrait() Trait { diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go index 36aeebb3d7..bdd1d09cf0 100644 --- a/pkg/trait/quarkus.go +++ b/pkg/trait/quarkus.go @@ -31,7 +31,7 @@ import ( type quarkusTrait struct { BaseTrait `property:",squash"` // The Quarkus runtime type (reserved for future use) - Native bool `property:"native"` + Native bool `property:"native" json:"native,omitempty"` } func newQuarkusTrait() Trait { diff --git a/pkg/trait/route.go b/pkg/trait/route.go index 9962823667..cd830d6480 100644 --- a/pkg/trait/route.go +++ b/pkg/trait/route.go @@ -36,23 +36,23 @@ import ( type routeTrait struct { BaseTrait `property:",squash"` // To configure the host exposed by the route. - Host string `property:"host"` + Host string `property:"host" json:"host,omitempty"` // The TLS termination type, like `edge`, `passthrough` or `reencrypt`. // // Refer to the OpenShift documentation for additional information. - TLSTermination string `property:"tls-termination"` + TLSTermination string `property:"tls-termination" json:"tlsTermination,omitempty"` // The TLS certificate contents. // // Refer to the OpenShift documentation for additional information. - TLSCertificate string `property:"tls-certificate"` + TLSCertificate string `property:"tls-certificate" json:"tlsCertificate,omitempty"` // The TLS certificate key contents. // // Refer to the OpenShift documentation for additional information. - TLSKey string `property:"tls-key"` + TLSKey string `property:"tls-key" json:"tlsKey,omitempty"` // The TLS cert authority certificate contents. // // Refer to the OpenShift documentation for additional information. - TLSCACertificate string `property:"tls-ca-certificate"` + TLSCACertificate string `property:"tls-ca-certificate" json:"tlsCACertificate,omitempty"` // The destination CA certificate provides the contents of the ca certificate of the final destination. When using reencrypt // termination this file should be provided in order to have routers use it for health checks on the secure connection. // If this field is not specified, the router may provide its own destination CA and perform hostname validation using @@ -60,11 +60,11 @@ type routeTrait struct { // verify. // // Refer to the OpenShift documentation for additional information. - TLSDestinationCACertificate string `property:"tls-destination-ca-certificate"` + TLSDestinationCACertificate string `property:"tls-destination-ca-certificate" json:"tlsDestinationCACertificate,omitempty"` // To configure how to deal with insecure traffic, e.g. `Allow`, `Disable` or `Redirect` traffic. // // Refer to the OpenShift documentation for additional information. - TLSInsecureEdgeTerminationPolicy string `property:"tls-insecure-edge-termination-policy"` + TLSInsecureEdgeTerminationPolicy string `property:"tls-insecure-edge-termination-policy" json:"tlsInsecureEdgeTerminationPolicy,omitempty"` service *corev1.Service } diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go index 71fb0d64e7..a2c85a4be9 100644 --- a/pkg/trait/route_test.go +++ b/pkg/trait/route_test.go @@ -32,6 +32,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) func createTestRouteEnvironment(t *testing.T, name string) *Environment { @@ -120,11 +121,9 @@ func TestRoute_Disabled(t *testing.T) { name := xid.New().String() environment := createTestRouteEnvironment(t, name) environment.Integration.Spec.Traits = map[string]v1.TraitSpec{ - "route": { - Configuration: map[string]string{ - "enabled": "false", - }, - }, + "route": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": false, + }), } traitsCatalog := environment.Catalog @@ -147,11 +146,9 @@ func TestRoute_TLS(t *testing.T) { traitsCatalog := environment.Catalog environment.Integration.Spec.Traits = map[string]v1.TraitSpec{ - "route": { - Configuration: map[string]string{ - "tls-termination": string(routev1.TLSTerminationEdge), - }, - }, + "route": test.TraitSpecFromMap(t, map[string]interface{}{ + "tlsTermination": string(routev1.TLSTerminationEdge), + }), } err := traitsCatalog.apply(environment) @@ -173,11 +170,9 @@ func TestRoute_WithCustomServicePort(t *testing.T) { name := xid.New().String() environment := createTestRouteEnvironment(t, name) environment.Integration.Spec.Traits = map[string]v1.TraitSpec{ - containerTraitID: { - Configuration: map[string]string{ - "service-port-name": "my-port", - }, - }, + containerTraitID: test.TraitSpecFromMap(t, map[string]interface{}{ + "servicePortName": "my-port", + }), } traitsCatalog := environment.Catalog @@ -194,9 +189,11 @@ func TestRoute_WithCustomServicePort(t *testing.T) { assert.NotNil(t, route) assert.NotNil(t, route.Spec.Port) + + trait := test.TraitSpecToMap(t, environment.Integration.Spec.Traits[containerTraitID]) assert.Equal( t, - environment.Integration.Spec.Traits[containerTraitID].Configuration["service-port-name"], + trait["servicePortName"], route.Spec.Port.TargetPort.StrVal, ) } diff --git a/pkg/trait/service.go b/pkg/trait/service.go index 30e3cf82e2..2ece2fdc92 100644 --- a/pkg/trait/service.go +++ b/pkg/trait/service.go @@ -18,11 +18,12 @@ limitations under the License. package trait import ( + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/metadata" "github.com/apache/camel-k/pkg/util/kubernetes" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // The Service trait exposes the integration with a Service resource so that it can be accessed by other applications @@ -34,9 +35,9 @@ import ( type serviceTrait struct { BaseTrait `property:",squash"` // To automatically detect from the code if a Service needs to be created. - Auto *bool `property:"auto"` + Auto *bool `property:"auto" json:"auto,omitempty"` // Enable Service to be exposed as NodePort - NodePort *bool `property:"nodeport"` + NodePort *bool `property:"node-port" json:"nodePort,omitempty"` } const ( @@ -105,7 +106,7 @@ func (t *serviceTrait) Configure(e *Environment) (bool, error) { return true, nil } -func (t *serviceTrait) isNodeport() bool { +func (t *serviceTrait) isNodePort() bool { return t.NodePort == nil || *t.NodePort } @@ -116,10 +117,9 @@ func (t *serviceTrait) Apply(e *Environment) error { if svc == nil { svc = getServiceFor(e) - if t.isNodeport() { - svc.Spec.Type = "NodePort" + if t.isNodePort() { + svc.Spec.Type = corev1.ServiceTypeNodePort } - } e.Resources.Add(svc) return nil diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go index 480d54e0c3..61e5597e4b 100644 --- a/pkg/trait/service_test.go +++ b/pkg/trait/service_test.go @@ -30,6 +30,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) const ( @@ -67,12 +68,10 @@ func TestServiceWithDefaults(t *testing.T) { }, }, Traits: map[string]v1.TraitSpec{ - "service": { - Configuration: map[string]string{ - "enabled": "true", - "auto": "false", - }, - }, + "service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "auto": false, + }), }, }, }, @@ -155,22 +154,18 @@ func TestService(t *testing.T) { }, }, Traits: map[string]v1.TraitSpec{ - "service": { - Configuration: map[string]string{ - "enabled": "true", - }, - }, - "container": { - Configuration: map[string]string{ - "enabled": "true", - "auto": "false", - "expose": "true", - "port": "8081", - "port-name": "http-8081", - "service-port": "81", - "service-port-name": "http-81", - }, - }, + "service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + }), + "container": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "auto": false, + "expose": true, + "port": 8081, + "portName": "http-8081", + "servicePort": 81, + "servicePortName": "http-81", + }), }, }, }, @@ -243,17 +238,13 @@ func TestServiceWithCustomContainerName(t *testing.T) { Spec: v1.IntegrationSpec{ Profile: v1.TraitProfileKubernetes, Traits: map[string]v1.TraitSpec{ - "service": { - Configuration: map[string]string{ - "enabled": "true", - "auto": "false", - }, - }, - "container": { - Configuration: map[string]string{ - "name": "my-container-name", - }, - }, + "service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "auto": false, + }), + "container": test.TraitSpecFromMap(t, map[string]interface{}{ + "name": "my-container-name", + }), }, }, }, @@ -289,14 +280,16 @@ func TestServiceWithCustomContainerName(t *testing.T) { assert.NotNil(t, d) assert.Len(t, d.Spec.Template.Spec.Containers, 1) + + trait := test.TraitSpecToMap(t, environment.Integration.Spec.Traits["container"]) assert.Equal( t, - environment.Integration.Spec.Traits["container"].Configuration["name"], + trait["name"], d.Spec.Template.Spec.Containers[0].Name, ) } -func TestServiceWithNodeport(t *testing.T) { +func TestServiceWithNodePort(t *testing.T) { catalog, err := camel.DefaultCatalog() assert.Nil(t, err) @@ -326,13 +319,11 @@ func TestServiceWithNodeport(t *testing.T) { }, }, Traits: map[string]v1.TraitSpec{ - "service": { - Configuration: map[string]string{ - "enabled": "true", - "auto": "false", - "nodeport": "true", - }, - }, + "service": test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "auto": false, + "node-port": true, + }), }, }, }, @@ -377,5 +368,5 @@ func TestServiceWithNodeport(t *testing.T) { assert.Len(t, s.Spec.Ports, 1) assert.Equal(t, int32(80), s.Spec.Ports[0].Port) - assert.Equal(t, corev1.ServiceType("NodePort"), s.Spec.Type) + assert.Equal(t, corev1.ServiceTypeNodePort, s.Spec.Type) } diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go index 5242004ee9..703b12a0c0 100644 --- a/pkg/trait/trait_catalog.go +++ b/pkg/trait/trait_catalog.go @@ -19,15 +19,17 @@ package trait import ( "context" + "encoding/json" "reflect" "sort" "strings" + "github.com/fatih/structs" + "github.com/pkg/errors" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/client" "github.com/apache/camel-k/pkg/util/log" - "github.com/fatih/structs" - "github.com/pkg/errors" ) // Catalog collects all information about traits in one place @@ -187,6 +189,15 @@ func (c *Catalog) configureTraits(traits map[string]v1.TraitSpec) error { return nil } +func decodeTraitSpec(in *v1.TraitSpec, target interface{}) error { + data, err := json.Marshal(&in.Configuration) + if err != nil { + return err + } + + return json.Unmarshal(data, &target) +} + // ComputeTraitsProperties returns all key/value configuration properties that can be used to configure traits func (c *Catalog) ComputeTraitsProperties() []string { results := make([]string, 0) diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go index 46e80db76d..d50bd912dd 100644 --- a/pkg/trait/trait_test.go +++ b/pkg/trait/trait_test.go @@ -33,6 +33,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/util/camel" "github.com/apache/camel-k/pkg/util/kubernetes" + "github.com/apache/camel-k/pkg/util/test" ) const ( @@ -80,11 +81,9 @@ func TestOpenShiftTraitsWithWeb(t *testing.T) { func TestOpenShiftTraitsWithWebAndConfig(t *testing.T) { env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift, "from('undertow:http').to('log:info')") env.Integration.Spec.Traits = make(map[string]v1.TraitSpec) - env.Integration.Spec.Traits["service"] = v1.TraitSpec{ - Configuration: map[string]string{ - "port": "7071", - }, - } + env.Integration.Spec.Traits["service"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "port": 7071, + }) res := processTestEnv(t, env) assert.NotNil(t, env.GetTrait("service")) assert.NotNil(t, env.GetTrait("route")) @@ -96,12 +95,10 @@ func TestOpenShiftTraitsWithWebAndConfig(t *testing.T) { func TestOpenShiftTraitsWithWebAndDisabledTrait(t *testing.T) { env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift, "from('undertow:http').to('log:info')") env.Integration.Spec.Traits = make(map[string]v1.TraitSpec) - env.Integration.Spec.Traits["service"] = v1.TraitSpec{ - Configuration: map[string]string{ - "enabled": "false", - "port": "7071", - }, - } + env.Integration.Spec.Traits["service"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": false, + "port": 7071, + }) res := processTestEnv(t, env) assert.Nil(t, env.GetTrait("service")) assert.Nil(t, env.GetTrait("route")) // No route without service @@ -146,13 +143,11 @@ func TestKubernetesTraitsWithWeb(t *testing.T) { func TestTraitDecode(t *testing.T) { env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift, "") env.Integration.Spec.Traits = make(map[string]v1.TraitSpec) - svcTrait := v1.TraitSpec{ - Configuration: map[string]string{ - "enabled": "false", - "port": "7071", - "cippa": "lippa", - }, - } + svcTrait := test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": false, + "port": 7071, + "cippa": "lippa", + }) env.Integration.Spec.Traits["service"] = svcTrait ctr := newContainerTrait().(*containerTrait) @@ -168,30 +163,24 @@ func TestTraitHierarchyDecode(t *testing.T) { env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift, "") env.Platform.Spec.Traits = make(map[string]v1.TraitSpec) - env.Platform.Spec.Traits["knative-service"] = v1.TraitSpec{ - Configuration: map[string]string{ - "enabled": "false", - "min-scale": "1", - "max-scale": "10", - "autoscaling-target": "15", - }, - } + env.Platform.Spec.Traits["knative-service"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": false, + "minScale": 1, + "maxScale": 10, + "autoscalingTarget": 15, + }) env.Platform.ResyncStatusFullConfig() env.IntegrationKit.Spec.Traits = make(map[string]v1.TraitSpec) - env.IntegrationKit.Spec.Traits["knative-service"] = v1.TraitSpec{ - Configuration: map[string]string{ - "enabled": "true", - "min-scale": "5", - }, - } + env.IntegrationKit.Spec.Traits["knative-service"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "enabled": true, + "minScale": 5, + }) env.Integration.Spec.Traits = make(map[string]v1.TraitSpec) - env.Integration.Spec.Traits["knative-service"] = v1.TraitSpec{ - Configuration: map[string]string{ - "max-scale": "20", - }, - } + env.Integration.Spec.Traits["knative-service"] = test.TraitSpecFromMap(t, map[string]interface{}{ + "maxScale": 20, + }) c := NewTraitTestCatalog() err := c.configure(env) diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go index eeeedd56ef..babe121bf6 100644 --- a/pkg/trait/trait_types.go +++ b/pkg/trait/trait_types.go @@ -128,13 +128,13 @@ func NewBaseTrait(id string, order int) BaseTrait { // BaseTrait is the root trait with noop implementations for hooks type BaseTrait struct { - TraitID ID + TraitID ID `json:"-"` // Can be used to enable or disable a trait. All traits share this common property. - Enabled *bool `property:"enabled"` - Client client.Client - Ctx context.Context - ExecutionOrder int - L log.Logger + Enabled *bool `property:"enabled" json:"enabled,omitempty"` + Client client.Client `json:"-"` + Ctx context.Context `json:"-"` + ExecutionOrder int `json:"-"` + L log.Logger `json:"-"` } // ID returns the identifier of the trait diff --git a/pkg/trait/util.go b/pkg/trait/util.go index 4ba2f9da94..1fcf299f13 100644 --- a/pkg/trait/util.go +++ b/pkg/trait/util.go @@ -25,13 +25,12 @@ import ( "strings" user "github.com/mitchellh/go-homedir" - "github.com/mitchellh/mapstructure" "github.com/scylladb/go-set/strset" + k8sclient "sigs.k8s.io/controller-runtime/pkg/client" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/client" - - k8sclient "sigs.k8s.io/controller-runtime/pkg/client" ) var exactVersionRegexp = regexp.MustCompile(`^(\d+)\.(\d+)\.([\w-.]+)$`) @@ -112,25 +111,17 @@ func CollectConfigurationPairs(configurationType string, configurable ...v1.Conf return result } -var ( - csvMapValidatingRegexp = regexp.MustCompile(`^(\w+)=([^,]+)(?:,(\w+)=([^,]+))*$`) - csvMapParsingRegexp = regexp.MustCompile(`(\w+)=([^,]+)`) -) +var keyValuePairRegexp = regexp.MustCompile(`^(\w+)=(.+)$`) -func parseCsvMap(csvMap *string) (map[string]string, error) { +func keyValuePairArrayAsStringMap(pairs []string) (map[string]string, error) { m := make(map[string]string) - if csvMap == nil || len(*csvMap) == 0 { - return m, nil - } - - if !csvMapValidatingRegexp.MatchString(*csvMap) { - return nil, fmt.Errorf("cannot parse [%s] as CSV map", *csvMap) - } - - matches := csvMapParsingRegexp.FindAllStringSubmatch(*csvMap, -1) - for i := range matches { - m[matches[i][1]] = matches[i][2] + for _, pair := range pairs { + if match := keyValuePairRegexp.FindStringSubmatch(pair); match != nil { + m[match[1]] = match[2] + } else { + return nil, fmt.Errorf("unable to parse key/value pair: %s", pair) + } } return m, nil @@ -149,25 +140,6 @@ func FilterTransferableAnnotations(annotations map[string]string) map[string]str return res } -func decodeTraitSpec(in *v1.TraitSpec, target interface{}) error { - md := mapstructure.Metadata{} - - decoder, err := mapstructure.NewDecoder( - &mapstructure.DecoderConfig{ - Metadata: &md, - WeaklyTypedInput: true, - TagName: "property", - Result: &target, - }, - ) - - if err != nil { - return err - } - - return decoder.Decode(in.Configuration) -} - func mustHomeDir() string { dir, err := user.Dir() if err != nil { diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go index 1a398007fe..097d08ab55 100644 --- a/pkg/util/digest/digest.go +++ b/pkg/util/digest/digest.go @@ -22,6 +22,8 @@ import ( "crypto/sha1" "crypto/sha256" "encoding/base64" + "encoding/json" + "fmt" "io" "os" "path" @@ -97,10 +99,18 @@ func ComputeForIntegration(integration *v1.Integration) (string, error) { if _, err := hash.Write([]byte(name + "[")); err != nil { return "", err } - spec := integration.Spec.Traits[name] - for _, prop := range util.SortedStringMapKeys(spec.Configuration) { - val := spec.Configuration[prop] - if _, err := hash.Write([]byte(prop + "=" + val + ",")); err != nil { + spec, err := json.Marshal(integration.Spec.Traits[name].Configuration) + if err != nil { + return "", err + } + trait := make(map[string]interface{}) + err = json.Unmarshal(spec, &trait) + if err != nil { + return "", err + } + for _, prop := range util.SortedMapKeys(trait) { + val := trait[prop] + if _, err := hash.Write([]byte(fmt.Sprintf("%s=%v,", prop, val))); err != nil { return "", err } } diff --git a/pkg/util/indentedwriter/writer.go b/pkg/util/indentedwriter/writer.go index cab0e8cfa7..ab4b033e93 100644 --- a/pkg/util/indentedwriter/writer.go +++ b/pkg/util/indentedwriter/writer.go @@ -61,14 +61,20 @@ func (iw *Writer) Flush() { } // IndentedString -- -func IndentedString(f func(io.Writer)) string { +func IndentedString(f func(io.Writer) error) (string, error) { var out tabwriter.Writer buf := &bytes.Buffer{} out.Init(buf, 0, 8, 2, ' ', 0) - f(&out) + err := f(&out) + if err != nil { + return "", err + } - out.Flush() + err = out.Flush() + if err != nil { + return "", err + } - return buf.String() + return buf.String(), nil } diff --git a/pkg/util/test/trait.go b/pkg/util/test/trait.go new file mode 100644 index 0000000000..fca3518389 --- /dev/null +++ b/pkg/util/test/trait.go @@ -0,0 +1,53 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package test + +import ( + "encoding/json" + "testing" + + "github.com/stretchr/testify/assert" + + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" +) + +// TraitSpecFromMap -- +func TraitSpecFromMap(t *testing.T, spec map[string]interface{}) v1.TraitSpec { + var trait v1.TraitSpec + + data, err := json.Marshal(spec) + assert.Nil(t, err) + + err = json.Unmarshal(data, &trait.Configuration) + assert.Nil(t, err) + + return trait +} + +// TraitSpecFromMap -- +func TraitSpecToMap(t *testing.T, spec v1.TraitSpec) map[string]string { + trait := make(map[string]string) + + data, err := json.Marshal(spec.Configuration) + assert.Nil(t, err) + + err = json.Unmarshal(data, &trait) + assert.Nil(t, err) + + return trait +} diff --git a/pkg/util/util.go b/pkg/util/util.go index 5a48a8e91f..cfd7e18c70 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -26,6 +26,7 @@ import ( "path" "regexp" "sort" + "strings" "github.com/pkg/errors" @@ -71,6 +72,18 @@ func StringSliceExists(slice []string, item string) bool { return false } +func StringSliceContainsAnyOf(slice []string, items ...string) bool { + for i := 0; i < len(slice); i++ { + for j := 0; j < len(items); j++ { + if strings.Contains(slice[i], items[j]) { + return true + } + } + } + + return false +} + // StringSliceUniqueAdd append the given item if not already present in the slice func StringSliceUniqueAdd(slice *[]string, item string) bool { if slice == nil { @@ -211,6 +224,18 @@ type BytesMarshaller interface { MarshalBytes() ([]byte, error) } +// SortedMapKeys -- +func SortedMapKeys(m map[string]interface{}) []string { + res := make([]string, len(m)) + i := 0 + for k := range m { + res[i] = k + i++ + } + sort.Strings(res) + return res +} + // SortedStringMapKeys -- func SortedStringMapKeys(m map[string]string) []string { res := make([]string, len(m))