From ca9b8b2b8f3c5ac0e8bb63ecbad5345eb42339ec Mon Sep 17 00:00:00 2001 From: mmelko Date: Tue, 22 Feb 2022 16:46:12 +0100 Subject: [PATCH] Refactor kaniko settings fix #3005 --- ...camel.apache.org_integrationplatforms.yaml | 24 ++++++++++++++----- .../ROOT/partials/apis/camel-k-crds.adoc | 9 +++++++ go.sum | 1 + .../crds/crd-integration-platform.yaml | 24 ++++++++++++++----- .../camel/v1/integrationplatform_types.go | 6 ++++- .../v1/integrationplatform_types_support.go | 17 ++++++++----- pkg/apis/camel/v1/zz_generated.deepcopy.go | 21 ++++++++++++++++ pkg/builder/kaniko.go | 2 ++ .../informers/externalversions/factory.go | 8 +++++++ pkg/cmd/install.go | 4 +++- pkg/cmd/trait_help_test.go | 1 + .../integrationplatform/initialize.go | 16 ++++++++++--- .../integrationplatform/kaniko_cache.go | 8 ++++++- pkg/platform/defaults.go | 18 ++++++++------ pkg/resources/resources.go | 12 ++++++++-- pkg/trait/builder.go | 17 ++++++++++--- pkg/trait/builder_test.go | 11 +++++---- 17 files changed, 158 insertions(+), 41 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 967d7feb27..69cd63451f 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -70,6 +70,10 @@ spec: build: description: specify how to build the Integration/IntegrationKits properties: + PublishStrategyOptions: + additionalProperties: + type: string + type: object baseImage: description: a base image that can be used as base layer for all images. It can be useful if you want to provide some custom @@ -83,7 +87,8 @@ spec: - pod type: string kanikoBuildCache: - description: enables Kaniko publish strategy cache + description: 'Deprecated: Use PublishStrategyOptions instead enables + Kaniko publish strategy cache' type: boolean maven: description: Maven configuration used to build the Camel/Camel-Quarkus @@ -192,8 +197,9 @@ spec: type: object type: object persistentVolumeClaim: - description: the Persistent Volume Claim used by Kaniko publish - strategy, if cache is enabled + description: 'Deprecated: Use PublishStrategyOptions instead the + Persistent Volume Claim used by Kaniko publish strategy, if + cache is enabled' type: string publishStrategy: description: the strategy to adopt for publishing an Integration @@ -311,6 +317,10 @@ spec: build: description: specify how to build the Integration/IntegrationKits properties: + PublishStrategyOptions: + additionalProperties: + type: string + type: object baseImage: description: a base image that can be used as base layer for all images. It can be useful if you want to provide some custom @@ -324,7 +334,8 @@ spec: - pod type: string kanikoBuildCache: - description: enables Kaniko publish strategy cache + description: 'Deprecated: Use PublishStrategyOptions instead enables + Kaniko publish strategy cache' type: boolean maven: description: Maven configuration used to build the Camel/Camel-Quarkus @@ -433,8 +444,9 @@ spec: type: object type: object persistentVolumeClaim: - description: the Persistent Volume Claim used by Kaniko publish - strategy, if cache is enabled + description: 'Deprecated: Use PublishStrategyOptions instead the + Persistent Volume Claim used by Kaniko publish strategy, if + cache is enabled' type: string publishStrategy: description: the strategy to adopt for publishing an Integration diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index bbb9e17597..f2bd9a4dcb 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -1603,6 +1603,7 @@ bool | +Deprecated: Use PublishStrategyOptions instead enables Kaniko publish strategy cache |`persistentVolumeClaim` + @@ -1610,8 +1611,16 @@ string | +Deprecated: Use PublishStrategyOptions instead the Persistent Volume Claim used by Kaniko publish strategy, if cache is enabled +|`PublishStrategyOptions` + +map[string]string +| + + + + |=== diff --git a/go.sum b/go.sum index dd203e7065..5eef203f6e 100644 --- a/go.sum +++ b/go.sum @@ -1964,6 +1964,7 @@ k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRV k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/code-generator v0.19.2/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= +k8s.io/code-generator v0.22.5 h1:jn+mYXI5q7rzo7Bz/n8xZIgbe61SeXlIjU5jA8jLVps= k8s.io/code-generator v0.22.5/go.mod h1:sbdWCOVob+KaQ5O7xs8PNNaCTpbWVqNgA6EPwLOmRNk= k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index 967d7feb27..69cd63451f 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -70,6 +70,10 @@ spec: build: description: specify how to build the Integration/IntegrationKits properties: + PublishStrategyOptions: + additionalProperties: + type: string + type: object baseImage: description: a base image that can be used as base layer for all images. It can be useful if you want to provide some custom @@ -83,7 +87,8 @@ spec: - pod type: string kanikoBuildCache: - description: enables Kaniko publish strategy cache + description: 'Deprecated: Use PublishStrategyOptions instead enables + Kaniko publish strategy cache' type: boolean maven: description: Maven configuration used to build the Camel/Camel-Quarkus @@ -192,8 +197,9 @@ spec: type: object type: object persistentVolumeClaim: - description: the Persistent Volume Claim used by Kaniko publish - strategy, if cache is enabled + description: 'Deprecated: Use PublishStrategyOptions instead the + Persistent Volume Claim used by Kaniko publish strategy, if + cache is enabled' type: string publishStrategy: description: the strategy to adopt for publishing an Integration @@ -311,6 +317,10 @@ spec: build: description: specify how to build the Integration/IntegrationKits properties: + PublishStrategyOptions: + additionalProperties: + type: string + type: object baseImage: description: a base image that can be used as base layer for all images. It can be useful if you want to provide some custom @@ -324,7 +334,8 @@ spec: - pod type: string kanikoBuildCache: - description: enables Kaniko publish strategy cache + description: 'Deprecated: Use PublishStrategyOptions instead enables + Kaniko publish strategy cache' type: boolean maven: description: Maven configuration used to build the Camel/Camel-Quarkus @@ -433,8 +444,9 @@ spec: type: object type: object persistentVolumeClaim: - description: the Persistent Volume Claim used by Kaniko publish - strategy, if cache is enabled + description: 'Deprecated: Use PublishStrategyOptions instead the + Persistent Volume Claim used by Kaniko publish strategy, if + cache is enabled' type: string publishStrategy: description: the strategy to adopt for publishing an Integration diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go index dfef411e91..c78af0388b 100644 --- a/pkg/apis/camel/v1/integrationplatform_types.go +++ b/pkg/apis/camel/v1/integrationplatform_types.go @@ -142,10 +142,14 @@ type IntegrationPlatformBuildSpec struct { Timeout *metav1.Duration `json:"timeout,omitempty"` // Maven configuration used to build the Camel/Camel-Quarkus applications Maven MavenSpec `json:"maven,omitempty"` + // Deprecated: Use PublishStrategyOptions instead // enables Kaniko publish strategy cache KanikoBuildCache *bool `json:"kanikoBuildCache,omitempty"` - // the Persistent Volume Claim used by Kaniko publish strategy, if cache is enabled + // Deprecated: Use PublishStrategyOptions instead + //the Persistent Volume Claim used by Kaniko publish strategy, if cache is enabled PersistentVolumeClaim string `json:"persistentVolumeClaim,omitempty"` + // + PublishStrategyOptions map[string]string `json:"PublishStrategyOptions,omitempty"` } // IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform diff --git a/pkg/apis/camel/v1/integrationplatform_types_support.go b/pkg/apis/camel/v1/integrationplatform_types_support.go index 41de3ea627..b644f462e1 100644 --- a/pkg/apis/camel/v1/integrationplatform_types_support.go +++ b/pkg/apis/camel/v1/integrationplatform_types_support.go @@ -18,6 +18,7 @@ limitations under the License. package v1 import ( + "strconv" "strings" corev1 "k8s.io/api/core/v1" @@ -178,13 +179,17 @@ func (in *IntegrationPlatformStatus) RemoveCondition(condType IntegrationPlatfor in.Conditions = newConditions } -// IsKanikoCacheEnabled tells if the KanikoCache is enabled on the integration platform build spec -func (b IntegrationPlatformBuildSpec) IsKanikoCacheEnabled() bool { - if b.KanikoBuildCache == nil { - // Cache is disabled by default - return false +// IsOptionEnabled tells if provided option key is present in PublishStrategyOptions and enabled +func (b IntegrationPlatformBuildSpec) IsOptionEnabled(option string) bool { + //Key defined in builder/kaniko.go + if enabled, ok := b.PublishStrategyOptions[option]; ok { + res, err := strconv.ParseBool(enabled) + if err != nil { + return false + } + return res } - return *b.KanikoBuildCache + return false } // GetTimeout returns the specified duration or a default one diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go index a93dd9ccb2..f8b9081b3d 100644 --- a/pkg/apis/camel/v1/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go @@ -203,6 +203,20 @@ func (in *BuilderTask) DeepCopyInto(out *BuilderTask) { *out = *in out.BaseTask = in.BaseTask in.Runtime.DeepCopyInto(&out.Runtime) + if in.Sources != nil { + in, out := &in.Sources, &out.Sources + *out = make([]SourceSpec, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = make([]ResourceSpec, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.Dependencies != nil { in, out := &in.Dependencies, &out.Dependencies *out = make([]string, len(*in)) @@ -865,6 +879,13 @@ func (in *IntegrationPlatformBuildSpec) DeepCopyInto(out *IntegrationPlatformBui *out = new(bool) **out = **in } + if in.PublishStrategyOptions != nil { + in, out := &in.PublishStrategyOptions, &out.PublishStrategyOptions + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IntegrationPlatformBuildSpec. diff --git a/pkg/builder/kaniko.go b/pkg/builder/kaniko.go index 82177a76e5..260dc72ec3 100644 --- a/pkg/builder/kaniko.go +++ b/pkg/builder/kaniko.go @@ -19,3 +19,5 @@ package builder // KanikoCacheDir is the cache directory for Kaniko builds (mounted into the Kaniko pod). const KanikoCacheDir = "/kaniko/cache" +const KanikoPVCName = "KanikoPersistentVolumeClaim" +const KanikoBuildCacheEnabled = "KanikoBuildCacheEnabled" diff --git a/pkg/client/camel/informers/externalversions/factory.go b/pkg/client/camel/informers/externalversions/factory.go index 7ac9088f71..d2344c02d4 100644 --- a/pkg/client/camel/informers/externalversions/factory.go +++ b/pkg/client/camel/informers/externalversions/factory.go @@ -81,6 +81,14 @@ func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Dur return NewSharedInformerFactoryWithOptions(client, defaultResync) } +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +// Deprecated: Please use NewSharedInformerFactoryWithOptions instead +func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { + return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions)) +} + // NewSharedInformerFactoryWithOptions constructs a new instance of a SharedInformerFactory with additional options. func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResync time.Duration, options ...SharedInformerOption) SharedInformerFactory { factory := &sharedInformerFactory{ diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go index 92ad2c4a1a..504e098c82 100644 --- a/pkg/cmd/install.go +++ b/pkg/cmd/install.go @@ -22,6 +22,7 @@ import ( "fmt" "os" "regexp" + "strconv" "strings" "time" @@ -39,6 +40,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/builder" "github.com/apache/camel-k/pkg/client" "github.com/apache/camel-k/pkg/install" "github.com/apache/camel-k/pkg/util" @@ -443,7 +445,7 @@ func (o *installCmdOptions) install(cobraCmd *cobra.Command, _ []string) error { kanikoBuildCacheFlag := cobraCmd.Flags().Lookup("kaniko-build-cache") if kanikoBuildCacheFlag.Changed { - platform.Spec.Build.KanikoBuildCache = &o.KanikoBuildCache + platform.Spec.Build.PublishStrategyOptions[builder.KanikoBuildCacheEnabled] = strconv.FormatBool(o.KanikoBuildCache) } // Always create a platform in the namespace where the operator is located diff --git a/pkg/cmd/trait_help_test.go b/pkg/cmd/trait_help_test.go index 6659b6b66a..63d5356470 100644 --- a/pkg/cmd/trait_help_test.go +++ b/pkg/cmd/trait_help_test.go @@ -1,3 +1,4 @@ +//go:build common // +build common /* diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go index 6bb5b3b1b2..4b1e2168ea 100644 --- a/pkg/controller/integrationplatform/initialize.go +++ b/pkg/controller/integrationplatform/initialize.go @@ -26,6 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/builder" "github.com/apache/camel-k/pkg/client" platformutil "github.com/apache/camel-k/pkg/platform" "github.com/apache/camel-k/pkg/util/defaults" @@ -68,9 +69,13 @@ func (action *initializeAction) Handle(ctx context.Context, platform *v1.Integra if err = platformutil.ConfigureDefaults(ctx, action.client, platform, true); err != nil { return nil, err } - + // nolint: staticcheck if platform.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko { - if platform.Status.Build.IsKanikoCacheEnabled() { + cacheEnabled := platform.Status.Build.IsOptionEnabled(builder.KanikoBuildCacheEnabled) + if _, found := platform.Status.Build.PublishStrategyOptions[builder.KanikoBuildCacheEnabled]; !found { + cacheEnabled = *platform.Status.Build.KanikoBuildCache + } + if cacheEnabled { // Create the persistent volume claim used by the Kaniko cache action.L.Info("Create persistent volume claim") err := createPersistentVolumeClaim(ctx, action.client, platform) @@ -120,6 +125,11 @@ func createPersistentVolumeClaim(ctx context.Context, client client.Client, plat if err != nil { return err } + // nolint: staticcheck + pvcName := platform.Status.Build.PersistentVolumeClaim + if persistentVolumeClaim, found := platform.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]; found { + pvcName = persistentVolumeClaim + } pvc := &corev1.PersistentVolumeClaim{ TypeMeta: metav1.TypeMeta{ @@ -128,7 +138,7 @@ func createPersistentVolumeClaim(ctx context.Context, client client.Client, plat }, ObjectMeta: metav1.ObjectMeta{ Namespace: platform.Namespace, - Name: platform.Status.Build.PersistentVolumeClaim, + Name: pvcName, Labels: map[string]string{ "app": "camel-k", }, diff --git a/pkg/controller/integrationplatform/kaniko_cache.go b/pkg/controller/integrationplatform/kaniko_cache.go index 8be897604a..6292eea9b3 100644 --- a/pkg/controller/integrationplatform/kaniko_cache.go +++ b/pkg/controller/integrationplatform/kaniko_cache.go @@ -40,6 +40,12 @@ func createKanikoCacheWarmerPod(ctx context.Context, client client.Client, platf // See: // - https://kubernetes.io/docs/concepts/storage/persistent-volumes/#node-affinity // - https://kubernetes.io/docs/concepts/storage/volumes/#local + // nolint: staticcheck + pvcName := platform.Status.Build.PersistentVolumeClaim + if persistentVolumeClaim, found := platform.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]; found { + pvcName = persistentVolumeClaim + } + pod := corev1.Pod{ TypeMeta: metav1.TypeMeta{ APIVersion: corev1.SchemeGroupVersion.String(), @@ -91,7 +97,7 @@ func createKanikoCacheWarmerPod(ctx context.Context, client client.Client, platf Name: "kaniko-cache", VolumeSource: corev1.VolumeSource{ PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ - ClaimName: platform.Status.Build.PersistentVolumeClaim, + ClaimName: pvcName, }, }, }, diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go index 0f0eb25041..af4a890df1 100644 --- a/pkg/platform/defaults.go +++ b/pkg/platform/defaults.go @@ -34,6 +34,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime/pkg/client" v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "github.com/apache/camel-k/pkg/builder" "github.com/apache/camel-k/pkg/client" "github.com/apache/camel-k/pkg/install" "github.com/apache/camel-k/pkg/kamelet/repository" @@ -153,6 +154,9 @@ func configureRegistry(ctx context.Context, c client.Client, p *v1.IntegrationPl } func setPlatformDefaults(p *v1.IntegrationPlatform, verbose bool) error { + if p.Status.Build.PublishStrategyOptions == nil { + p.Status.Build.PublishStrategyOptions = map[string]string{} + } if p.Status.Build.RuntimeVersion == "" { p.Status.Build.RuntimeVersion = defaults.DefaultRuntimeVersion } @@ -169,8 +173,8 @@ func setPlatformDefaults(p *v1.IntegrationPlatform, verbose bool) error { "-Dstyle.color=never", } } - if p.Status.Build.PersistentVolumeClaim == "" { - p.Status.Build.PersistentVolumeClaim = p.Name + if _, ok := p.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]; !ok { + p.Status.Build.PublishStrategyOptions[builder.KanikoPVCName] = p.Name } if p.Status.Build.GetTimeout().Duration != 0 { @@ -189,15 +193,15 @@ func setPlatformDefaults(p *v1.IntegrationPlatform, verbose bool) error { Duration: 5 * time.Minute, } } - - if p.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko && p.Status.Build.KanikoBuildCache == nil { + _, cacheEnabled := p.Status.Build.PublishStrategyOptions["KanikoBuildCache"] + if p.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko && !cacheEnabled { // Default to disabling Kaniko cache warmer // Using the cache warmer pod seems unreliable with the current Kaniko version // and requires relying on a persistent volume. - defaultKanikoBuildCache := false - p.Status.Build.KanikoBuildCache = &defaultKanikoBuildCache + defaultKanikoBuildCache := "false" + p.Status.Build.PublishStrategyOptions[builder.KanikoBuildCacheEnabled] = defaultKanikoBuildCache if verbose { - log.Log.Infof("Kaniko cache set to %t", *p.Status.Build.KanikoBuildCache) + log.Log.Infof("Kaniko cache set to %s", defaultKanikoBuildCache) } } diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 0aa38201a0..50e8e8af75 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -38,6 +38,13 @@ var assets = func() http.FileSystem { name: "/", modTime: time.Time{}, }, + "/.DS_Store": &vfsgen۰CompressedFileInfo{ + name: ".DS_Store", + modTime: time.Time{}, + uncompressedSize: 8196, + + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x99\x3f\x8b\xd4\x40\x18\xc6\x9f\xd9\x5d\xb8\x55\x39\x48\x73\x70\x8d\x90\x42\xb0\x3e\x1b\x3b\x89\x47\xec\x85\xe0\xbf\x46\x36\x9b\xc9\xdd\x89\x89\x09\xc9\x6e\x9f\x46\x10\x41\xf0\x5a\x41\x3f\x80\x85\x8d\xb5\x20\x28\x88\xa5\x7e\x22\xc9\xcd\x1b\x33\xb3\x33\x39\xd3\xc8\xc9\xfa\xfe\x60\xf7\x81\x7d\x9f\xe4\x7d\x08\x93\x49\x66\x16\x80\x38\x5c\xcb\x03\x60\x1f\xc0\x1c\x4a\xbd\x2b\x70\x32\xa7\x8f\xc5\x84\xd4\x6f\xcf\x07\x78\x38\x88\x92\x22\x2f\xcf\x7e\xdb\x75\x9f\x8b\x61\x18\x86\x61\x98\x0b\x46\x28\x99\x0f\x3c\xf7\x19\x86\xf9\x8f\x11\xfd\xbb\x3d\x02\xd2\x46\xa9\xa0\xfa\x84\x74\xa6\x1d\xe3\x91\xfa\xa4\x01\x69\xa3\x54\x90\x6f\x42\x3a\x23\x9d\x93\x7a\xa4\x3e\x69\x40\xda\x28\xa5\x49\x4b\xd0\xe2\x43\x50\x67\x41\x2b\x14\xe1\x91\xfa\xa4\xc1\xdf\xb9\x36\x0c\xb3\x0d\xb4\xb7\xc9\x14\x09\x2a\xc8\xec\x58\x5f\xbf\x9f\xbe\xe8\x2b\x79\x11\x86\xcb\xac\x58\xb6\x2f\x0b\x37\xcb\xfb\xf7\xbe\xdd\xfd\x72\x5b\xaf\xca\x73\xaa\xe5\x89\x7e\xd6\xcf\xed\xf7\x0e\x24\x52\x1c\x21\xc6\x1a\x19\x56\x46\x5f\xec\xee\xd9\x0e\xbd\xff\xe9\xd7\xdf\x1d\x2c\x97\x1c\xe1\x32\xf2\xa8\xc9\x66\x07\x39\x62\x3c\x43\x8c\x63\xa4\xa8\xcc\x3c\x7b\x4f\x6d\x87\x9e\xe7\xfb\xcf\x07\x7d\xa7\x0d\x97\x1c\xe1\x32\xf3\x9c\xcd\x56\x97\xc8\xf1\x04\x47\x48\x51\x63\x85\xda\xcc\x74\xfd\xa3\xdb\xa5\xe7\x7a\xf5\xe3\x61\xd7\xd1\xe9\x94\x23\x9d\x8e\x7c\x97\x51\xa2\x42\x81\x1c\x29\x56\x38\x41\x8a\xf5\x66\xc2\xab\x1f\x86\x7c\x7a\xc6\x5b\x6f\x1f\x75\x9d\x07\xbc\x72\xb4\xd7\x91\x73\x86\x0a\x4b\xc4\x48\xcc\x6c\xcf\x23\xbd\xa6\xe7\xb9\xf1\xee\x71\xd7\x43\xab\xcb\x73\xeb\x46\x5f\xf1\x5a\x8d\xa7\x1a\x31\x72\x94\xc8\xda\xab\x68\x76\xbf\xf6\xc9\x76\xe8\x19\xca\x68\xd1\x8f\x94\x0d\x97\x1c\xe1\x32\xaf\x43\xa3\xc6\x53\x8d\x04\x05\x2a\xa4\x48\x10\x5b\xf7\x3a\xa6\xef\xdd\x2e\x3d\xd7\xcb\x37\x8b\x7e\x94\x38\x9c\x72\xa4\xd3\xba\xff\xf8\xf9\xcf\x30\x17\xc1\x54\xc9\x7e\xbb\xfe\xbf\x33\xbc\xff\xcf\x30\xcc\x16\x23\x66\x61\x14\x1e\xf6\x1b\x82\x16\x13\x5a\x28\x2c\xba\x03\xfe\xb0\x11\x20\xb4\x3f\x0c\x79\x23\x80\x61\xfe\x3d\x7e\x05\x00\x00\xff\xff\x1e\x4b\x19\xd0\x04\x20\x00\x00"), + }, "/addons": &vfsgen۰DirInfo{ name: "addons", modTime: time.Time{}, @@ -138,9 +145,9 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrationplatforms.yaml", modTime: time.Time{}, - uncompressedSize: 29222, + uncompressedSize: 29810, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5d\xdd\x73\xe3\x38\x72\x7f\xd7\x5f\xd1\xb5\x7e\x18\x6f\x95\x44\xed\xe6\xee\x2a\x17\xa5\x52\x29\x9d\xc6\xb3\xe7\x78\xc6\x76\x2c\xcd\x6c\xee\x69\x0d\x91\x2d\x12\x27\x10\x60\x00\x50\x1a\x5d\x2a\xff\x7b\x0a\x1f\xa4\x28\x89\x5f\xf6\xf8\xb2\xc9\x16\xf9\xb0\x3b\x16\x81\x46\xa3\xd1\x1f\x3f\x34\x1a\xd2\x15\x4c\xde\xee\x19\x5d\xc1\x47\x1a\x22\x57\x18\x81\x16\xa0\x13\x84\x79\x46\xc2\x04\x61\x29\x36\x7a\x4f\x24\xc2\x07\x91\xf3\x88\x68\x2a\x38\x5c\xcf\x97\x1f\xbe\x87\x9c\x47\x28\x41\x70\x04\x21\x21\x15\x12\x47\x57\x10\x0a\xae\x25\x5d\xe7\x5a\x48\x60\x8e\x20\x90\x58\x22\xa6\xc8\xb5\x0a\x00\x96\x88\x96\xfa\xfd\xc3\xea\x76\x71\x03\x1b\xca\x10\x22\xaa\x5c\x27\x8c\x60\x4f\x75\x32\xba\x02\x9d\x50\x05\x7b\x21\xb7\xb0\x11\x12\x48\x14\x51\x33\x30\x61\x40\xf9\x46\xc8\xd4\xb1\x21\x31\x26\x32\xa2\x3c\x86\x50\x64\x07\x49\xe3\x44\x83\xd8\x73\x94\x2a\xa1\x59\x30\xba\x82\x95\x99\xc6\xf2\x43\xc1\x89\x72\x64\xed\x98\x5a\xc0\x5f\x44\xee\xe7\x50\x99\xae\x97\xc2\x18\xbe\xa0\x54\x66\x90\x7f\x08\x7e\x18\x5d\xc1\xb5\x69\xf2\x9d\x7f\xf9\xdd\xf7\xff\x0c\x07\x91\x43\x4a\x0e\xc0\x85\x86\x5c\x61\x85\x32\x7e\x0d\x31\xd3\x40\x39\x84\x22\xcd\x18\x25\x3c\xc4\xe3\xb4\xca\x11\x02\xb0\x0c\x18\x1a\x62\xad\x09\xe5\x40\xec\x34\x40\x6c\xaa\xcd\x80\xe8\xd1\xd5\xe8\x0a\xec\x93\x68\x9d\xcd\xa6\xd3\xfd\x7e\x1f\x10\xcb\x6e\x20\x64\x3c\x2d\x66\x37\xfd\x78\xbb\xb8\xb9\x5f\xde\x4c\x2c\xcb\xa3\x2b\xf8\xcc\x19\x2a\x05\x12\xff\x33\xa7\x12\x23\x58\x1f\x80\x64\x19\xa3\x21\x59\x33\x04\x46\xf6\x66\xe1\xec\xea\xd8\x45\xa7\x1c\xf6\x92\x6a\xca\xe3\x31\x28\xbf\xea\xa3\xab\x93\xd5\x39\x8a\xab\x60\x8f\xaa\x93\x06\x82\x03\xe1\xf0\xdd\x7c\x09\xb7\xcb\xef\xe0\x4f\xf3\xe5\xed\x72\x3c\xba\x82\x9f\x6f\x57\x7f\x7e\xf8\xbc\x82\x9f\xe7\x4f\x4f\xf3\xfb\xd5\xed\xcd\x12\x1e\x9e\x60\xf1\x70\xff\xfe\x76\x75\xfb\x70\xbf\x84\x87\x0f\x30\xbf\xff\x0b\xdc\xdd\xde\xbf\x1f\x03\x52\x9d\xa0\x04\xfc\x9a\x49\xc3\xbf\x90\x40\x8d\x20\x31\x32\x6b\x5a\x28\x50\xc1\x80\xd1\x0f\xf3\xb7\xca\x30\xa4\x1b\x1a\x02\x23\x3c\xce\x49\x8c\x10\x8b\x1d\x4a\x6e\xd4\x23\x43\x99\x52\x65\x96\x53\x01\xe1\xd1\xe8\x0a\x18\x4d\xa9\xb6\x5a\xa4\x2e\x27\x65\x86\x79\x4b\xdb\x1a\x91\x8c\x7a\x75\x9a\x01\xc9\x28\x7e\xd5\xc8\x2d\x37\xc1\xf6\x8f\x2a\xa0\x62\xba\xfb\x71\xb4\xa5\x3c\x9a\xc1\x22\x57\x5a\xa4\x4f\xa8\x44\x2e\x43\x7c\x8f\x1b\xca\xad\xe6\x8f\x52\xd4\x24\x22\x9a\xcc\x46\x00\x84\x73\xe1\x99\x37\x7f\x82\xb3\x3a\xc1\x18\xca\x49\x8c\x3c\xd8\xe6\x6b\x5c\xe7\x94\x45\x28\x2d\xf1\x62\xe8\xdd\x0f\xc1\xef\x83\x1f\x47\x00\xa1\x44\xdb\x7d\x45\x53\x54\x9a\xa4\xd9\x0c\x78\xce\xd8\x08\x80\x91\x35\x32\x4f\x95\x64\xd9\x0c\x42\x92\x22\x9b\x6c\x47\x00\x9c\xa4\x38\x03\xca\x35\xc6\xd2\xf6\xce\x18\xd1\xc6\x18\x55\x60\x1b\x55\x54\x72\x64\x16\xc3\x10\x89\xa5\xc8\x0b\x22\xd5\xf7\x8e\x5a\xc1\x3d\xd1\x18\x0b\x49\x8b\xbf\x27\xb0\x35\xed\xfd\xbf\xc3\xf2\xdf\x4e\x42\xb7\x47\x06\x1e\x3d\x03\xf6\x2d\xa3\x4a\xdf\x35\xb5\xf8\x48\x95\xb6\xad\x32\x96\x4b\xc2\xea\xa7\x61\x1b\xa8\x44\x48\x7d\x7f\x64\x6e\x02\x34\x73\x2f\x28\x8f\x73\x46\x64\x6d\xdf\x11\x80\x0a\x45\x86\x33\xb0\x5d\x33\x12\x62\x34\x02\xf0\x92\xb7\xa4\x26\x15\x2f\xf6\x28\x0d\x0d\xb9\x10\x2c\x4f\x79\x39\x50\x84\x2a\x94\x34\xd3\x76\xad\x8c\xeb\xaa\x0c\x04\xc5\x48\x90\x25\x44\xe1\xc8\xf9\x83\xbf\x2a\xc1\x1f\x89\x4e\x66\x10\x28\x4d\x74\xae\x82\xea\x5b\xb7\x60\x8f\x95\x4f\xf4\xc1\xb0\x68\xac\x95\xc7\xa3\x63\x93\xdd\x8f\x6e\x86\x61\x82\x29\x99\xf9\xb6\x22\x43\x3e\x7f\xbc\xfd\xf2\xbb\xe5\xc9\xc7\x70\xca\x66\x8d\xac\x8d\x4b\x30\xc6\x24\xbd\x12\x1b\xf7\x68\xfd\x4b\x24\xe9\xce\xd9\xee\xc2\xac\x29\xdc\x95\x24\xed\x68\x92\x98\xa0\xb1\xc6\x84\xec\xa8\x90\x01\xdc\x6a\x88\x8c\xfe\xa3\x23\x57\xbc\x30\xfe\x91\x30\xe6\x2d\x05\x0a\x53\x51\x70\xfd\x5c\x61\xe6\x8e\xea\xe7\x71\x85\x7e\xf5\xdd\xf3\x18\x9e\xef\x0c\x07\xa8\x9f\xbf\x37\x5e\xcf\x90\x8f\xe9\x0e\xb9\xd3\x4a\xb3\x7a\x01\xfc\x9c\x20\xaf\x32\x5b\xb2\x58\xa1\x4a\x15\x50\xae\x34\x61\x0c\x23\x43\xe8\x39\x66\x62\x4d\xd8\x33\xa4\x22\xc2\xb1\x8d\x11\x7b\xca\x18\x70\xef\x61\x9d\x8f\x3a\x18\x17\xf9\x5c\x23\xb9\xe7\x2a\x69\x0e\x48\xc2\xe4\xc8\x11\xec\x13\x94\xe8\x68\x12\xae\x6b\x59\x33\x63\xac\x4d\x04\xc2\xd0\x78\xe3\x92\x5c\x26\x4d\x0b\x5d\x5a\x98\x7b\x2a\x5e\xa9\xf2\xe9\xd9\x02\xbf\x33\x3a\xe0\x43\x61\x75\x39\xbc\x6a\x63\xe4\xd5\xc6\x85\x2d\x6a\xa2\x8d\xf1\xda\xc8\x9d\x83\x3a\x21\x0c\x76\xed\x38\x88\xf5\x5f\x31\xd4\x01\x2c\x51\x1a\x32\xc6\xe6\x72\x16\x19\x2f\xb6\x43\xa9\x41\x62\x28\x62\x4e\xff\x56\xd2\x56\x05\x24\x61\x44\xa3\x37\xe4\xaa\xa4\x34\x4a\x03\x0d\x76\x84\xe5\x38\x36\x0e\xde\x46\x55\x89\x66\x14\xc8\x79\x85\x9e\x6d\xa2\x02\xf8\x24\x24\x5a\x28\x31\xb3\x31\x55\xcd\xa6\xd3\x98\xea\xc2\x1b\x87\x22\x4d\x73\x4e\xf5\x61\x5a\x81\x33\x6a\x1a\xe1\x0e\xd9\x54\xd1\x78\x42\x64\x98\x50\x8d\xa1\xce\x25\x4e\x49\x46\x27\x96\x75\x6e\x3d\x72\x90\x46\x57\x85\xea\xab\x77\x27\xbc\x5e\x98\x9f\x7b\xac\x5f\x6b\x59\x01\xe3\xd5\x8c\xaa\x11\xdf\xd5\xcd\xe2\x28\x68\xf3\x91\x91\xce\xd3\xcd\x72\x75\xb4\x3a\xb3\x18\xe7\xd2\xb7\x72\x3f\x76\x54\xc7\x25\x30\x02\xa3\x7c\x63\xe3\xa0\x01\x32\x52\xa4\x96\x26\xf2\x28\x13\xd4\xab\x5b\xc8\x28\xf2\x73\xf1\xab\x7c\x9d\x52\xed\x50\x06\x2a\x6d\xd6\x2a\x80\x85\x0d\x51\x46\x17\xf3\x2c\x22\x1a\xa3\x00\x6e\xb9\x53\xd7\x05\x31\xd8\xe7\xef\xbc\x00\x46\xd2\x6a\x62\x04\xdb\x6f\x09\xaa\xd1\xf5\xbc\xb1\x93\x5a\xe5\x45\x11\xdc\x1a\xd6\xab\xc6\xb0\x97\x19\x86\x27\xd6\x13\xa1\xb2\x88\xcc\x78\x6d\x34\x56\xd1\x14\xd5\x8a\xa7\xde\x82\xcd\x63\x03\xfd\xf9\x87\x67\x2c\x15\x7e\x27\x11\x7b\xeb\x22\x4c\x17\xcb\x47\x65\xd8\xe9\xa9\xf7\x3c\xd7\x9d\x36\x16\x2c\x1b\x44\xe1\x6d\x4a\x62\xac\x7b\x79\xc6\x0e\xb1\xad\x81\x9a\xe6\xa0\x13\xa2\x21\x24\xdc\x2a\x8b\x89\x14\x44\xb9\xd7\x8c\x1c\x50\x3a\xf8\xcf\x58\x2d\x51\x70\x24\x94\x8d\x15\x47\x12\x9b\x9c\x01\xdd\x54\x3c\xa5\x30\xbc\xef\x68\x84\xa0\x44\x8a\x10\xda\xc8\xd1\x40\xb1\xc2\x99\xc1\xec\xb0\xc9\xa5\x05\xa3\xb9\xa6\x8c\xea\x43\x09\x8c\x2f\xe5\x03\xcd\xea\x75\xb2\x56\x4b\x2d\x0d\xe0\x39\xf4\x10\x94\xc5\xb5\xbe\xb9\x99\x06\x89\x44\xa6\xad\x48\x2c\x25\x63\xf8\x84\x57\x17\xb1\x73\x52\xb5\x0d\x90\xe7\x69\x3d\x37\x13\x90\x22\xd7\x94\xd7\xf7\x9b\x40\x26\xa2\xd7\xc8\x61\x4b\x38\xdd\x8a\x3f\x99\x39\x2c\x0c\x26\xec\x21\x0a\xe4\x66\xd3\xa2\xe0\xce\x76\x85\x2c\x5f\x33\xaa\x92\xa3\x74\x42\x43\xa7\x85\x97\xb5\x10\x0c\x49\x9d\x80\x52\xb2\x43\xde\x83\x83\x4f\xa6\x9d\x09\x52\x1b\x1a\xe7\x1e\x95\x15\xd0\xe6\x68\x51\xd6\xc7\x4d\xed\x7f\x27\xff\x9e\x13\xb9\xcd\xeb\x35\x05\x8a\xad\x98\xf5\x59\xb5\x4d\xda\x0d\x0e\x2c\x72\x5e\x62\x28\x51\x37\xbd\x87\x4b\x4c\xe9\x3a\x58\x58\x61\x23\xe5\x16\x0f\x63\xbb\x7f\x20\x94\x17\x81\x64\x31\x87\xd0\x0c\xbc\x31\xec\xe1\xb5\xfa\xbe\x91\x3c\x94\x12\x08\x05\xe7\x26\xb8\x68\x01\x12\x53\xa1\xd1\xcb\x4b\x62\x26\x14\xd5\x16\xde\x97\x76\xea\xc7\x6b\x21\xfb\x1f\xc1\x1f\x7e\xf8\xa7\x2a\x17\xca\x05\xf6\xc7\xbb\xc5\xf2\xea\x1f\xc1\xe5\x00\xcc\x86\xb3\xd2\x04\xc2\x84\x50\xae\x82\x16\xb2\x73\xf8\xb7\xbb\x65\xa5\xf7\x16\x0f\x4a\xdb\x50\xa4\x80\xe4\x5a\xa4\x44\xd3\x90\x30\x76\x70\x5b\x24\x8f\xda\x4c\x8b\x16\xa2\xb5\x22\x73\xec\x16\xda\xe2\xb5\xe4\xe8\xe1\x08\x68\x99\xab\x2a\x46\xbb\x7c\x4e\x09\x9a\xdd\xbb\x19\xa9\x50\xc3\x34\x25\x3c\x52\x01\xdc\x1b\x59\x5b\x27\x6a\x41\xb7\x10\xe7\x01\xba\xfa\x9c\xb2\xa9\x80\x48\x04\xc2\x94\x30\x1b\x6c\x21\xb5\x45\xb1\x1e\x6b\x15\x02\x28\x44\xd4\x2c\xd6\x6e\x3d\x35\xcf\x16\x1b\x3c\x5e\xf1\x5c\xa8\xea\x16\xcb\x64\x88\x72\x5a\x6b\x16\x03\x99\x51\x33\x03\x50\x02\x80\x4f\xf9\x05\x1c\x3c\x7f\xd6\x08\xc4\x20\x26\x1a\x15\x54\xb6\x78\x68\xd3\x91\x4e\xef\x55\x3c\x76\xf3\xd4\x7f\x4a\xef\xcc\xd6\xb0\x98\x90\xc4\x0d\x4a\xe4\xba\x16\x09\x99\xfd\xbb\xe4\xa8\xd1\x82\xa1\x48\x84\xca\xe0\xa0\x10\x33\xad\xa6\x62\x87\x72\x47\x71\x3f\xdd\x0b\xb9\xa5\x3c\x9e\x98\x28\x35\x71\x18\x45\x4d\xed\x6e\x61\x7a\x65\xff\xd7\x21\x97\xd5\xc3\xfb\x87\x19\xcc\xa3\x08\x84\x0b\x70\x2e\x70\x6e\x28\x32\xa3\x56\xc7\xcd\xc1\xd8\x02\xd4\x31\xe4\x34\xfa\xd7\x77\x6f\x21\x37\x91\xb9\x5d\xf0\x0b\x64\xb7\xf4\x00\x66\x9f\xa0\x65\x56\x1f\x3d\x99\x90\x60\xe0\xa7\x51\x96\xb4\x97\x36\x38\x1c\xd6\x66\x78\xdd\x31\xc3\x3d\x45\x62\xad\x79\x22\x13\xc3\x57\xe3\xdb\x06\x7c\x59\x7d\x42\x46\x1f\xb2\x4a\xa6\xa7\xee\xb9\x30\x9c\xc5\xc7\x5b\x2f\x64\xe5\x3c\x83\x35\xf3\x2c\x43\x1e\x1d\xd3\xbb\x8c\xb6\x0a\xcb\xec\xd4\x64\x9c\xdb\xb4\xad\x45\x1c\xa7\x7e\x67\x0c\x18\xc4\xc1\x18\x9e\x27\x5f\xc6\x93\x09\x17\x13\x2d\x09\x57\x1b\x94\x93\x4c\x8a\x58\xa2\x52\xe3\xc9\x7b\xa5\x0f\x0c\x83\x50\x30\x21\xff\x85\xe3\x0e\xe5\x73\x9b\xdd\x2d\x11\x4b\x0b\xb0\x31\xb9\x9a\xe3\x94\xb8\x99\xfe\x2e\xf8\x63\xf0\x7b\xf7\x6a\x82\xe9\x1a\xa3\x08\xe5\x34\x64\x34\x48\x74\xca\x9a\x29\x53\x8d\x69\xab\x67\xea\xa5\xb6\xae\x11\x91\x92\x34\xad\x67\x99\xd5\x7b\xc1\x4a\x39\xa1\x3a\xf4\x50\xc9\x0a\xb6\xcb\x22\xce\x69\x84\x6a\x9a\x52\x4e\xdd\xbf\x27\xb9\x32\x9e\xa0\x42\xe0\x1b\x25\x72\x89\x7b\xe6\x26\x68\x90\xf0\x98\x92\x21\xf0\xd3\xfc\x0b\x5c\xff\x64\x13\x7c\xc5\xdb\x99\x77\x19\x6d\x80\x01\xfc\xa4\x89\xef\xd3\xd2\xb4\x5f\x60\x81\x92\xd4\x6d\x8b\x25\x36\x4d\x0c\xe6\xdd\x7c\x40\x7f\xdf\xe6\x53\x9e\xaf\xe2\xc4\xca\xf2\xad\xd8\xd8\xd5\x65\x76\x7a\xb1\xe1\xd7\xf0\x6d\x18\xe9\x76\x91\x36\x33\x5a\x2e\x60\x6b\x33\x2f\xda\x4e\x53\x6e\xf5\xa8\x7d\x4c\x99\x89\x90\xb0\xa7\x02\xb9\xb6\xe0\x96\x0b\x83\xce\x88\x4e\x8a\x18\x6f\xa9\x9c\xc3\xe0\x16\xe8\xd1\x43\xa4\x7d\x2c\xa2\x9a\x66\xee\x63\x3f\xbd\x56\xb2\xc1\x73\x1d\xf9\xe9\x9a\x56\xeb\x9a\x28\xd4\x9a\xf2\xb8\x6f\x8c\x9b\x17\xf0\x29\xc4\x22\x9a\x2d\x2c\xd0\xfe\x44\x32\x83\x07\x96\x25\xce\xb3\xe1\xaf\x0d\x62\xbb\x8d\x88\xaa\x20\xeb\x82\x97\x6f\xc5\xbb\x61\xc1\xd1\x1d\x1e\x9e\x70\xf3\x12\xb0\x63\x21\xae\x71\xb1\x1e\x01\x93\xe3\xf4\xda\x81\x6b\x5f\x87\xd9\x03\x8d\x5f\x70\x55\x20\xf2\x12\x83\xb7\xb3\x02\x2f\x71\x56\x7d\xb0\xf4\x05\x43\xff\xc7\xf0\x34\xbc\x02\x53\xf7\x20\xd9\x8d\xba\xe1\x65\x92\xee\x87\xbe\xa1\x0f\x02\x3f\x31\xba\xba\x94\xe1\xe5\x53\xc0\xf4\xbe\x40\x1c\x7a\x83\x71\xe8\x19\x6d\xba\x40\x39\xf4\x0d\x23\xe0\xf7\x93\x6f\x61\xdf\x8e\xd2\xaf\x6f\xdc\xdf\xbe\xdd\x86\xd7\x6d\xb9\x61\x70\x17\xbf\x79\x77\x71\xb1\x61\xef\x31\x9f\xdf\x88\xaf\xe8\x6c\xd4\xd1\x20\x33\x7a\xa0\x34\x72\xfd\x45\xb0\x3c\xc5\x05\x23\xb4\x21\x65\x7f\x71\x80\xf0\x58\xf6\x05\xd7\x19\x6c\x6f\x97\x8a\x5c\x1f\xce\x32\xea\x4d\x08\xcd\xe7\xd9\xc7\x40\x37\x2e\xd7\x0e\x54\xf9\xa4\xfc\xab\x8e\x00\xfc\x70\x6f\x72\x18\xe2\x69\xbd\xd5\x71\x48\x07\xe7\x12\x63\xaa\x74\xd3\xae\xe0\x82\x65\x77\x96\x54\x74\x2a\xf3\xe5\x59\xae\x92\x69\x96\x33\xd6\x83\x5f\x77\xca\xf5\xca\x33\x02\x12\x45\x12\x55\x5f\x68\x6d\x38\xfe\xfc\x74\x6b\xe5\x1b\x86\xa8\x9a\xdd\x58\x0f\x1f\x12\x92\x17\x8c\xea\xf0\x72\x4a\x32\xd8\x27\x34\x4c\x5c\xd6\xdd\x01\xf3\x45\x25\xc7\x3f\xcf\x75\x22\x24\xd5\x5d\x59\xb5\x56\xc6\x28\x57\x18\xe6\xb2\x25\x84\x9c\xb0\x47\x37\x05\x87\x66\xb3\x80\xf2\xb8\x9a\xae\x00\xc4\xd2\x82\x6b\x8a\x63\x1b\x43\xda\xb2\x6a\x9c\x1d\x9a\x93\x23\x7d\x9c\x97\x90\x31\xe1\xf4\x6f\x56\x5d\x5e\x20\xdd\x92\xe3\x6a\xff\x6f\x11\xa1\x7a\xc9\xc1\x53\x05\x53\xb8\x2a\x96\x50\x62\x84\x5c\x53\xc2\xdc\x19\x84\x5d\xec\x66\xef\xde\xc9\x4f\x87\xfb\x94\x39\xd7\x34\xc5\x47\x77\x0a\x2c\x7b\x5a\xae\xef\x65\x4d\x36\x80\x8f\x74\x8b\xec\xe0\x4b\x6e\xfc\xc9\x1e\x5c\xef\xcb\xf2\xa6\x06\xe6\x13\xb2\x43\x48\x09\xe5\x25\x39\xa7\xde\x09\x51\xb0\x46\xe4\x10\x51\x65\x14\x8b\xf2\x1c\x23\x50\xd4\xec\x69\x77\xad\x19\x98\x1f\x83\x3f\xd4\xab\x50\x97\xdf\x72\xe3\xd7\x96\xfc\x34\xca\xa0\xa8\x30\x7a\xf2\xcc\x47\x68\xb3\xc8\x3c\x3c\xb4\x72\xd9\xc1\x8a\x21\x25\xf2\x06\xed\x39\xe1\x21\x11\x7b\x48\xf3\x30\xb1\x5d\x8c\x57\xda\x13\x6a\x00\xc1\xc6\xc0\x36\xfb\x99\xc8\xdd\xc9\x97\x4b\xa2\x66\x52\x34\x7a\xad\x56\xa6\x5a\x34\x28\x64\xb9\xd2\x75\x5a\x73\xc2\xe9\x3e\x21\xda\xc2\x34\x83\x31\x7d\x17\x38\x88\xfc\x9d\xb4\x9a\x64\x0f\x57\xad\x8b\xc8\x98\xd1\x86\xbb\x12\x64\xd6\xf0\x2a\x24\x3c\x64\xc8\x55\x42\x37\xfa\x72\xad\x5b\xe6\x71\x72\x3a\xdd\xc1\x30\xa3\x4a\x5b\x5e\x4f\x4e\xb4\x8f\x01\xc5\x9f\x58\x12\xad\x4d\xb8\xb7\x41\xab\xbe\x10\xa3\xa3\x90\xc4\xae\x8c\x2e\x4a\x8a\xa8\xea\xac\x75\x81\xb6\x14\xf5\xc9\x14\x16\x55\xd6\x6d\x91\xcd\xb1\xb6\x09\x08\xc4\xc8\x51\xd2\xf0\x74\x86\xb5\xaa\x51\x14\x0f\x37\xb5\xe8\x0a\xb3\x45\xd5\xd5\x5d\xf3\xce\xeb\x74\x33\xf2\xde\xf0\x69\x02\x5a\x34\x03\x2e\x80\x09\x1e\xbb\x0d\x40\xd4\x84\xde\x3b\x7d\x60\xc1\xc3\x27\x91\x73\xfd\x28\x28\x6f\xf4\xce\xff\x6b\xac\xac\x4c\xc3\x5f\x8b\x09\xdd\x7b\xf0\x8a\xd2\x18\x5d\x36\x1d\x2f\x0c\x63\x0c\x14\x67\x85\x1e\x1c\x9a\xb7\x62\x25\x8c\x19\xfb\x88\x37\x86\x20\x08\x5e\x3d\x09\x5b\xea\xd7\x6b\x16\xb6\x28\xd3\x16\x06\x1a\x43\x55\x8a\xc6\xbc\x48\x8e\x9e\x5a\xf8\xb5\x3a\x70\x4d\xbe\x36\xce\x20\x25\x07\xd8\x11\x79\xf0\xbe\xde\xf8\x2d\xe1\x2a\x61\x9f\xcd\x7a\x3e\x37\xe1\x97\x4e\xd8\xdc\xbc\xdf\x9a\xd8\xce\xb5\x2f\xec\x94\xea\x9c\x4e\x5b\xc4\x6f\xce\xf0\x6f\x5d\xdd\x6f\x87\x6b\x3c\x15\xd8\x69\x51\xad\xf7\x83\xe0\x2b\x88\xd5\xb1\xf8\xbe\x0e\xbf\xd8\xa2\x8d\x9e\x3e\xaf\xdd\xc9\x54\x0b\x69\x7a\x04\x4e\x5f\x84\x73\x3c\x77\x28\x77\x1e\x12\xb5\xa4\xb8\xc3\x62\x06\x10\x12\x4d\x98\xa8\xd7\xbf\xd6\xa3\xc2\xae\xb2\x47\x3f\xc0\xf1\x20\xa5\x5a\x07\xd9\x0c\xf6\xfc\xd1\x89\x95\xbd\xcf\xd7\x9c\xb1\x6a\xa6\x91\xab\xa6\x9a\x9c\x3e\x89\xb2\x5c\xd2\xde\x07\xa0\x0e\x3f\x9f\x8b\xd3\xd7\x8d\xbb\x5a\x22\x88\xa9\x4e\xf2\xf5\xec\xe1\xe9\xa7\xe9\xd3\xcd\xe3\xc3\xf4\x71\xbe\xfa\xf3\x2f\xab\x87\x5f\xee\xe6\x9f\x6e\x3e\xde\xac\x96\xbf\x7c\x78\xf8\xf8\xfe\xe6\xa9\x65\xc8\x1e\x98\xbb\x67\x16\xa1\xfe\x64\xab\xa5\x73\x26\xc5\x86\xb2\x1a\x37\x73\x21\x06\xdf\xd2\x57\xb6\xab\xc4\x2f\x84\x2d\xec\xb2\x95\xee\x24\xcb\xd8\xc1\xd6\x18\x19\x90\xa3\x25\xa9\x4f\x0b\x3b\x0c\x6c\x90\x7f\xf5\x72\xd2\xc9\x35\x9e\x62\xa8\x30\x11\x0a\xb9\x1d\x21\x57\xb9\xad\xcd\x92\x68\x0b\xc1\x1b\xa0\xc8\xc2\x63\x2f\x5b\xbe\x69\x3e\x28\x52\x58\x4e\xf3\x68\xa1\x57\x76\x24\xc2\x8a\x81\x94\x45\x67\x35\x34\xef\x38\xd1\x74\x87\x2f\xc2\x61\x65\x01\x78\x87\x4c\xcf\xe2\x9e\x6e\x88\x78\x2d\x6b\xe7\x44\x7c\x39\x4c\xdf\x53\xc0\xb3\x83\xb5\x95\x21\x67\xcd\xf4\xe4\x68\xec\xd4\x21\xda\x94\xb5\x1d\xf8\x15\x50\xa9\x03\xa2\xd6\x70\x65\x79\x5a\x9c\xa2\x54\x22\x49\x8a\x1a\xa5\xea\x01\xee\x7a\xe5\xe8\xbe\x4e\x8e\x69\xdf\x89\x85\x03\x72\x87\x93\x9c\x6f\xb9\xd8\xf3\x89\x4b\xc9\xce\x40\xcb\xda\x60\xd4\x1e\xdb\xba\x38\x6c\xe5\xae\x16\xb2\xbb\x45\x3f\x0f\x4c\xbe\x54\xfa\xc5\x85\xdd\xf0\x2a\x84\xde\xc8\x75\x53\xd5\xbc\xbd\xa0\xf4\xc2\xba\x79\xdb\xe7\xa4\x72\x5e\xac\xed\xca\x0c\xa5\xf3\x43\xe9\x7c\xab\xa0\x86\xd2\xf9\xa1\x74\x7e\x28\x9d\x1f\x4a\xe7\x87\xd2\xf9\xa1\x74\x7e\x28\x9d\x1f\x4a\xe7\xeb\x9f\xa1\x74\x7e\x28\x9d\x1f\x4a\xe7\x87\xd2\xf9\x93\x67\x28\x9d\xff\x06\x53\x1e\x4a\xe7\x3b\x27\x3a\x94\xce\x0f\xa5\xf3\x5d\xfd\x87\x5a\xd8\xdf\x76\x2d\xec\x50\x3a\x3f\x94\xce\xd7\x3d\x43\xe9\xfc\xe0\x2e\x86\xd2\xf9\x17\x35\x1a\x4a\xe7\x7b\xcd\x65\x28\x9d\x3f\x17\xe3\x50\x3a\xff\x0a\xc6\x86\xd2\xf9\xa1\x74\xbe\x9b\xe3\xa1\x74\x7e\x28\x9d\x87\xff\x77\xa5\xf3\x2e\xf9\xd3\x55\xb3\x75\xac\x5d\xf3\x9e\xcd\x77\x83\x14\x35\x5c\x67\x44\x6a\x1a\xe6\x8c\x48\x76\x28\x50\xe9\x3e\xc1\xba\xb5\xa6\x1c\x6e\x9e\x9e\x1e\x9e\xdc\x57\xfa\x5e\x32\xdb\xaf\x06\xbe\xa6\xfc\x65\x51\xf0\xe4\x5b\xae\x7d\x30\x28\x4a\x66\x6a\x97\x98\x1c\xbf\x3a\x94\x68\x20\x65\x0d\x9f\xfd\xfa\xcf\xba\x1d\x48\x57\xfc\x64\x44\xe9\x95\x24\x5c\x59\x56\x56\xb4\x79\xdb\x71\x32\x9f\x8f\x44\x69\xaf\xb2\x55\xf1\x82\x2e\x49\x61\xe4\x4a\x95\x04\x47\x5f\x55\xd4\xec\xfd\x04\x10\x6e\x77\x08\x4d\x7b\x28\x77\xa0\x3d\x83\x88\x68\x9c\x98\x61\x1b\xda\x75\xfa\x51\x33\xdd\xcf\xf6\xcb\x4e\x7b\x4f\x75\x65\xbf\xd2\xf6\x38\x5d\xaa\x2a\xf3\xdd\x13\x55\x7e\x79\xea\xdf\x9b\xf7\x14\x95\x6a\xac\x3f\xba\xc8\x20\x26\x79\x4a\xf8\x44\x22\x89\xec\xf7\xc8\xfb\xce\x40\x79\x64\x6b\x32\x78\x0c\x11\x6a\x42\x4d\x7c\x5a\x8b\xbc\x05\xd9\x27\x58\x59\xd5\xa6\x49\xf6\xb8\x6c\x40\x54\xdf\x4a\x42\x1b\xce\x4d\xf3\xf2\x6b\xe3\x4b\x81\xbf\x53\x7e\x2d\xbe\x9d\xa3\xba\x52\xb7\x06\x8e\x7c\x85\x9b\xd8\x9c\x32\x33\x76\x3f\xab\xb0\x81\x95\xcc\x71\x0c\x1f\x08\x53\x38\x86\xcf\xae\x1a\xf1\xd5\x7c\xf5\xbe\x11\xb1\xf2\x37\x20\xaa\x5f\x40\x5e\xf2\xf6\xca\xe1\xdb\x6b\x24\x1b\xed\xb8\xf1\x6a\xc0\x2b\x2f\x00\x0c\x37\xa4\x86\x1b\x52\xc3\x0d\xa9\x4a\x83\x5e\x83\x0f\x37\xa4\xaa\xcf\x6f\xfa\x86\x94\x4d\xe8\x5e\xb4\xef\x7b\x32\xda\x3a\xc5\x93\xd5\x28\x5c\xcf\xe9\x0f\xfa\xb0\xa2\x72\xf0\xb8\x2f\x11\x9b\xb6\x9f\x60\x28\x9e\xf2\x07\x6b\x5e\x20\x86\xe1\x32\xd8\x70\x19\x0c\x86\xcb\x60\x67\x02\x33\x9b\xd1\x0e\x93\x28\x2a\x99\x28\x77\x7b\x77\xdb\xe7\x1c\xe5\x54\x7f\x0f\x66\x23\x72\x7e\x69\x11\x2d\xb3\x1c\xae\xa4\x0d\x57\xd2\x86\x2b\x69\xc3\x95\xb4\xb7\xb9\x92\xd6\x52\xd3\xd7\x98\xb6\x2d\x7f\x53\xc9\x77\x2d\x43\xbb\xbb\xea\xf1\x22\x96\x6a\x0c\xb2\x96\xd7\x8b\x0f\xdd\x5d\xb7\xca\x22\x2b\x2d\x24\x89\xb1\xfa\x49\xbe\xbe\x30\x6d\x9f\x80\x80\xff\xfa\xef\xd1\xff\x04\x00\x00\xff\xff\x6b\x8d\xad\x21\x26\x72\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5d\x5f\x93\xdb\x38\x72\x7f\xd7\xa7\xe8\xda\x79\xb0\xb7\x4a\xa2\x76\x73\x77\x95\x8b\x52\xa9\x94\x4e\x1e\xef\x4d\xc6\x9e\x99\x8c\x64\x6f\xee\x69\x07\x22\x5b\x24\x4e\x20\xc0\x00\xa0\x64\x5d\x2a\xdf\x3d\x85\x3f\xa4\x48\x89\xa4\xa8\xb1\x2f\x7b\xb5\x45\x3e\xec\x7a\x44\xa0\xd1\x68\x34\xba\x7f\x68\x74\x4b\x37\x30\xf9\x76\xcf\xe8\x06\x3e\xd0\x10\xb9\xc2\x08\xb4\x00\x9d\x20\xcc\x33\x12\x26\x08\x4b\xb1\xd1\x7b\x22\x11\xde\x8b\x9c\x47\x44\x53\xc1\xe1\xed\x7c\xf9\xfe\x7b\xc8\x79\x84\x12\x04\x47\x10\x12\x52\x21\x71\x74\x03\xa1\xe0\x5a\xd2\x75\xae\x85\x04\xe6\x08\x02\x89\x25\x62\x8a\x5c\xab\x00\x60\x89\x68\xa9\x3f\x3c\xae\xee\x16\xb7\xb0\xa1\x0c\x21\xa2\xca\x75\xc2\x08\xf6\x54\x27\xa3\x1b\xd0\x09\x55\xb0\x17\x72\x0b\x1b\x21\x81\x44\x11\x35\x03\x13\x06\x94\x6f\x84\x4c\x1d\x1b\x12\x63\x22\x23\xca\x63\x08\x45\x76\x90\x34\x4e\x34\x88\x3d\x47\xa9\x12\x9a\x05\xa3\x1b\x58\x99\x69\x2c\xdf\x17\x9c\x28\x47\xd6\x8e\xa9\x05\xfc\x45\xe4\x7e\x0e\x95\xe9\x7a\x29\x8c\xe1\x33\x4a\x65\x06\xf9\xa7\xe0\x87\xd1\x0d\xbc\x35\x4d\xbe\xf3\x2f\xbf\xfb\xfe\x5f\xe1\x20\x72\x48\xc9\x01\xb8\xd0\x90\x2b\xac\x50\xc6\x2f\x21\x66\x1a\x28\x87\x50\xa4\x19\xa3\x84\x87\x78\x9c\x56\x39\x42\x00\x96\x01\x43\x43\xac\x35\xa1\x1c\x88\x9d\x06\x88\x4d\xb5\x19\x10\x3d\xba\x19\xdd\x80\x7d\x12\xad\xb3\xd9\x74\xba\xdf\xef\x03\x62\xd9\x0d\x84\x8c\xa7\xc5\xec\xa6\x1f\xee\x16\xb7\x0f\xcb\xdb\x89\x65\x79\x74\x03\x9f\x38\x43\xa5\x40\xe2\x7f\xe7\x54\x62\x04\xeb\x03\x90\x2c\x63\x34\x24\x6b\x86\xc0\xc8\xde\x2c\x9c\x5d\x1d\xbb\xe8\x94\xc3\x5e\x52\x4d\x79\x3c\x06\xe5\x57\x7d\x74\x53\x5b\x9d\xa3\xb8\x0a\xf6\xa8\xaa\x35\x10\x1c\x08\x87\xef\xe6\x4b\xb8\x5b\x7e\x07\x7f\x9a\x2f\xef\x96\xe3\xd1\x0d\xfc\x7c\xb7\xfa\xf3\xe3\xa7\x15\xfc\x3c\x7f\x7e\x9e\x3f\xac\xee\x6e\x97\xf0\xf8\x0c\x8b\xc7\x87\x77\x77\xab\xbb\xc7\x87\x25\x3c\xbe\x87\xf9\xc3\x5f\xe0\xfe\xee\xe1\xdd\x18\x90\xea\x04\x25\xe0\x97\x4c\x1a\xfe\x85\x04\x6a\x04\x89\x91\x59\xd3\x42\x81\x0a\x06\x8c\x7e\x98\xbf\x55\x86\x21\xdd\xd0\x10\x18\xe1\x71\x4e\x62\x84\x58\xec\x50\x72\xa3\x1e\x19\xca\x94\x2a\xb3\x9c\x0a\x08\x8f\x46\x37\xc0\x68\x4a\xb5\xd5\x22\x75\x3e\x29\x33\xcc\xb7\xdc\x5b\x23\x92\x51\xaf\x4e\x33\x20\x19\xc5\x2f\x1a\xb9\xe5\x26\xd8\xfe\x51\x05\x54\x4c\x77\x3f\x8e\xb6\x94\x47\x33\x58\xe4\x4a\x8b\xf4\x19\x95\xc8\x65\x88\xef\x70\x43\xb9\xd5\xfc\x51\x8a\x9a\x44\x44\x93\xd9\x08\x80\x70\x2e\x3c\xf3\xe6\x4f\x70\xbb\x4e\x30\x86\x72\x12\x23\x0f\xb6\xf9\x1a\xd7\x39\x65\x11\x4a\x4b\xbc\x18\x7a\xf7\x43\xf0\xfb\xe0\xc7\x11\x40\x28\xd1\x76\x5f\xd1\x14\x95\x26\x69\x36\x03\x9e\x33\x36\x02\x60\x64\x8d\xcc\x53\x25\x59\x36\x83\x90\xa4\xc8\x26\xdb\x11\x00\x27\x29\xce\x80\x72\x8d\xb1\xb4\xbd\x33\x46\xb4\xd9\x8c\x2a\xb0\x8d\x2a\x2a\x39\x32\x8b\x61\x88\xc4\x52\xe4\x05\x91\xea\x7b\x47\xad\xe0\x9e\x68\x8c\x85\xa4\xc5\xdf\x13\xd8\x9a\xf6\xfe\xdf\x61\xf9\x6f\x27\xa1\xbb\x23\x03\x4f\x9e\x01\xfb\x96\x51\xa5\xef\xdb\x5a\x7c\xa0\x4a\xdb\x56\x19\xcb\x25\x61\xcd\xd3\xb0\x0d\x54\x22\xa4\x7e\x38\x32\x37\x01\x9a\xb9\x17\x94\xc7\x39\x23\xb2\xb1\xef\x08\x40\x85\x22\xc3\x19\xd8\xae\x19\x09\x31\x1a\x01\x78\xc9\x5b\x52\x93\x8a\x15\x7b\x92\x86\x86\x5c\x08\x96\xa7\xbc\x1c\x28\x42\x15\x4a\x9a\x69\xbb\x56\xc6\x74\x55\x06\x82\x62\x24\xc8\x12\xa2\x70\xe4\xec\xc1\x5f\x95\xe0\x4f\x44\x27\x33\x08\x94\x26\x3a\x57\x41\xf5\xad\x5b\xb0\xa7\xca\x27\xfa\x60\x58\x34\xbb\x95\xc7\xa3\x63\x93\xdd\x8f\x6e\x86\x61\x82\x29\x99\xf9\xb6\x22\x43\x3e\x7f\xba\xfb\xfc\xbb\x65\xed\x63\xa8\xb3\xd9\x20\x6b\x63\x12\xcc\x66\x92\x5e\x89\x8d\x79\xb4\xf6\x25\x92\x74\xe7\xf6\xee\xc2\xac\x29\xdc\x97\x24\xed\x68\x92\x18\xa7\xb1\xc6\x84\xec\xa8\x90\x01\xdc\x69\x88\x8c\xfe\xa3\x23\x57\xbc\x30\xf6\x91\x30\xe6\x77\x0a\x14\x5b\x45\xc1\xdb\x97\x0a\x33\xf7\x54\xbf\x8c\x2b\xf4\xab\xef\x5e\xc6\xf0\x72\x6f\x38\x40\xfd\xf2\xbd\xb1\x7a\x86\x7c\x4c\x77\xc8\x9d\x56\x9a\xd5\x0b\xe0\xe7\x04\x79\x95\xd9\x92\xc5\x0a\x55\xaa\x80\x72\xa5\x09\x63\x18\x19\x42\x2f\x31\x13\x6b\xc2\x5e\x20\x15\x11\x8e\xad\x8f\xd8\x53\xc6\x80\x7b\x0b\xeb\x6c\xd4\xc1\x98\xc8\x97\x06\xc9\xbd\x54\x49\x73\x40\x12\x26\x47\x8e\x60\x9f\xa0\x44\x47\x93\x70\xdd\xc8\x9a\x19\x63\x6d\x3c\x10\x86\xc6\x1a\x97\xe4\x32\x69\x5a\xe8\x72\x87\xb9\xa7\x62\x95\x2a\x9f\x9e\x2c\xf0\x1b\xa3\x03\xde\x15\x56\x97\xc3\xab\x36\x46\x5e\x6d\x9c\xdb\xa2\xc6\xdb\x18\xab\x8d\xdc\x19\xa8\x1a\x61\xb0\x6b\xc7\x41\xac\xff\x8a\xa1\x0e\x60\x89\xd2\x90\x31\x7b\x2e\x67\x91\xb1\x62\x3b\x94\x1a\x24\x86\x22\xe6\xf4\x6f\x25\x6d\x55\x40\x12\x46\x34\xfa\x8d\x5c\x95\x94\x46\x69\xa0\xc1\x8e\xb0\x1c\xc7\xc6\xc0\x5b\xaf\x2a\xd1\x8c\x02\x39\xaf\xd0\xb3\x4d\x54\x00\x1f\x85\x44\x0b\x25\x66\xd6\xa7\xaa\xd9\x74\x1a\x53\x5d\x58\xe3\x50\xa4\x69\xce\xa9\x3e\x4c\x2b\x70\x46\x4d\x23\xdc\x21\x9b\x2a\x1a\x4f\x88\x0c\x13\xaa\x31\xd4\xb9\xc4\x29\xc9\xe8\xc4\xb2\xce\xad\x45\x0e\xd2\xe8\xa6\x50\x7d\xf5\xa6\xc6\xeb\xd9\xf6\x73\x8f\xb5\x6b\x1d\x2b\x60\xac\x9a\x51\x35\xe2\xbb\xba\x59\x1c\x05\x6d\x3e\x32\xd2\x79\xbe\x5d\xae\x8e\xbb\xce\x2c\xc6\xa9\xf4\xad\xdc\x8f\x1d\xd5\x71\x09\x8c\xc0\x28\xdf\x58\x3f\x68\x80\x8c\x14\xa9\xa5\x89\x3c\xca\x04\xf5\xea\x16\x32\x8a\xfc\x54\xfc\x2a\x5f\xa7\x54\x3b\x94\x81\x4a\x9b\xb5\x0a\x60\x61\x5d\x94\xd1\xc5\x3c\x8b\x88\xc6\x28\x80\x3b\xee\xd4\x75\x41\x0c\xf6\xf9\x3b\x2f\x80\x91\xb4\x9a\x18\xc1\xf6\x5b\x82\xaa\x77\x3d\x6d\xec\xa4\x56\x79\x51\x38\xb7\x96\xf5\x6a\xd8\xd8\xcb\x0c\xc3\xda\xee\x89\x50\x59\x44\x66\xac\x36\x9a\x5d\xd1\xe6\xd5\x8a\xa7\x79\x07\x9b\xc7\x3a\xfa\xd3\x0f\x4f\x58\x2a\xec\x4e\x22\xf6\xd6\x44\x98\x2e\x96\x8f\xca\xb0\xd3\xba\xf5\x3c\xd5\x9d\x2e\x16\xcc\xf3\x94\xaf\x19\x55\xc9\x52\x4b\xe3\xcd\x0f\x8f\x59\x05\x9e\x9c\x3e\x55\x47\xd8\x45\x13\xda\x17\xec\xb4\xc1\xd9\x22\x95\xe2\x21\x0a\xef\x52\x12\x63\xf3\x00\x35\x31\x11\xdb\x1a\xa8\x69\x0e\x3a\x21\x1a\x42\xc2\xad\x12\x1b\x0f\x46\x94\x7b\xcd\xc8\x01\xa5\x3b\x96\x30\xd6\xc2\xb5\x25\xa1\xac\x0f\x3b\x92\xd8\xe4\x0c\xe8\xa6\x62\xc1\x85\x91\xe9\x8e\x46\x08\x4a\xa4\x08\xa1\xf5\x68\x2d\x14\x2b\x9c\x99\xb3\x04\x6c\x72\x69\x41\x72\xae\x29\xa3\xfa\x50\x02\xf6\xf3\x75\xeb\x21\x45\xab\x10\xc5\xd2\xf5\x10\x94\xc5\xdb\xbe\xb9\x99\x06\x89\x44\xa6\xad\x48\x2c\x25\x63\x90\x08\xaf\x2a\xd7\xc5\x49\x35\x36\x40\x9e\xa7\xcd\xdc\x4c\x40\x8a\x5c\x53\xde\xdc\x6f\x02\x99\x88\x5e\x23\x87\x2d\xe1\x74\x2b\xfe\x64\xe6\xb0\x30\x58\xb5\x87\x28\xde\xbc\x33\xd6\xd4\x40\xd8\x68\x06\x9f\x14\xb6\x6c\x04\x8b\x13\x90\x44\x80\xdc\x1c\xbe\x9a\x57\x09\xe0\xde\x32\x00\x99\xa3\x71\x94\x71\x68\xb8\x79\xd3\x31\xa5\xb5\x10\x0c\x49\x93\x9c\x53\xb2\x43\xde\x63\x22\x1f\x4d\x3b\xe3\x83\x37\x34\xce\x3d\xe8\x2c\x90\xdb\xd1\x60\x58\x13\x3e\xb5\xff\x9d\xfc\x67\x4e\xe4\x36\x6f\x9b\x8a\x3f\x69\xda\xd9\x37\x36\xe9\xb6\x27\x60\x0f\x06\x4b\x0c\x25\xea\xb6\xf7\x70\x0e\x99\x5d\x07\x8b\x9a\x2c\x10\xd8\xe2\x61\x6c\x8f\x47\x84\xf2\xc2\x4f\x2e\xe6\x10\x9a\x81\x37\x86\x3d\x7c\xab\xbe\x6f\x25\x0f\xa5\x04\x42\xc1\xb9\xf1\x9d\x5a\x80\xc4\x54\x68\xf4\xf2\x92\x98\x09\x45\xb5\x3d\xbd\x94\xdb\xdd\x8f\xd7\x41\xf6\xbf\x82\x3f\xfc\xf0\x2f\x55\x2e\x94\xc3\x2d\x4f\xf7\x8b\xe5\xcd\x3f\x83\x0b\x71\x98\xf3\x74\xa5\x09\x84\x09\xa1\x5c\x05\x1d\x64\xe7\xf0\x1f\xf7\xcb\x4a\xef\x2d\x1e\x94\xb6\x9e\x56\x01\xc9\xb5\x48\x89\xa6\x21\x61\xec\xe0\x4e\x80\x1e\x94\x9a\x16\x1d\x44\x1b\x45\xe6\xd8\x2d\xb4\xc5\x6b\xc9\xd1\x50\x12\xd0\x32\x57\x55\x08\x7a\xfe\xd4\x09\xc2\xfa\x60\x47\x2a\xd4\x30\x4d\x09\x8f\x54\x00\x0f\x46\xd6\xd6\x16\xdb\x33\x85\x10\x4d\x46\xbe\x78\xea\x6c\x2a\x20\x12\x81\x30\x25\x80\xa6\x99\x90\xda\x82\x74\x0f\x25\x0b\x01\x14\x22\x6a\x17\xeb\x65\x3d\x35\xcf\x16\x5b\x0c\x67\xf1\x9c\xa9\xea\x16\xcb\x58\x8f\x72\x5a\x6b\x16\x03\x99\x51\x33\x83\xbf\x02\x80\x8f\xf9\x19\xda\x3d\x7d\xd6\x08\xc4\x00\x42\x1a\x15\x54\xb6\x78\xe8\xd2\x91\x1e\x2e\xd5\x3d\xf6\x6c\xd8\x7f\x4a\x6f\xcc\xc9\xb7\x98\x90\xc4\x0d\x4a\xe4\xba\x11\xe8\x6d\xf3\x35\x4a\x8e\x1a\x2d\xd6\x8b\x44\xa8\x0c\xcc\x0b\x31\xd3\x6a\x2a\x76\x28\x77\x14\xf7\xd3\xbd\x90\x5b\xca\xe3\x89\x71\x76\x13\xe7\xdd\xd5\xd4\x1e\x86\xa6\x37\xf6\x7f\x17\xe4\xb2\x7a\x7c\xf7\x38\x83\x79\x14\x81\x70\x7e\xd2\xf9\xdf\x0d\x45\x66\xd4\xea\x78\xf6\x19\x5b\xfc\x3d\x86\x9c\x46\xff\xde\x6c\x61\xaf\x94\x9b\xc8\x1c\xb6\xb9\x42\x76\x4b\x8f\xcf\xf6\x09\x5a\x66\xf5\xd1\x92\x09\x09\x06\x5d\x1b\x65\x49\x7b\x69\x83\x83\x99\x5d\x1b\xef\xb2\xcf\x70\x4f\x11\x37\x6c\x9f\xc8\xc4\xf0\xd5\xfa\xf6\x02\x32\x33\x4f\xc8\x68\x27\x52\x84\xa6\x8d\xb3\xf8\x70\xe7\x85\xac\x9c\x65\xb0\xdb\x3c\xcb\x90\x47\xc7\xe8\x35\xa3\x9d\xc2\x32\x07\x51\x19\xe7\x36\x2a\x6d\x81\x4b\xdd\xee\x8c\x01\x83\x38\x18\xc3\xcb\xe4\xf3\x78\x32\xe1\x62\xa2\x25\xe1\x6a\x83\x72\x92\x49\x11\x4b\x54\x6a\x3c\x79\xa7\xf4\x81\x61\x10\x0a\x26\xe4\xbf\x71\xdc\xa1\x7c\xe9\xda\x77\x4b\xc4\x72\x07\x58\x9f\x5c\x0d\xe1\x4a\xdc\x4c\x7f\x17\xfc\x31\xf8\xbd\x7b\x35\xc1\x74\x8d\x51\x84\x72\x1a\x32\x1a\x24\x3a\x65\xed\x94\xa9\xc6\xb4\xd3\x32\xf5\x52\x5b\xd7\x88\x48\x49\xda\xd6\xb3\x0c\x5a\x5e\xb1\x52\x4e\xa8\x0e\x3d\x54\x82\x9e\xdd\xb2\x88\x73\x1a\xa1\x9a\xa6\x94\x53\xf7\xef\x49\xae\x8c\x25\xa8\x10\xf8\x4a\x89\x9c\xe3\x9e\xb9\x71\x1a\x24\x3c\x46\x9c\x08\xfc\x34\xff\x0c\x6f\x7f\xb2\xf1\xcb\xe2\xed\xcc\x9b\x8c\x2e\xc0\x00\x7e\xd2\xc4\xf7\xe9\x68\xda\xcf\xb1\x40\x49\xea\xae\x63\x27\xb6\x4d\x0c\xe6\x97\xf9\x80\xfe\xb6\xcd\x47\x74\x5f\xc5\x89\x95\xe5\xb7\x62\x63\xd7\x14\xb8\xea\xc5\x86\x5f\xc3\x6f\xc3\xc8\x65\x13\x69\x03\xbf\xe5\x02\x76\x36\xf3\xa2\xbd\xb8\x95\x3b\x2d\x6a\x9f\xad\xcc\x44\x48\xd8\x73\x81\x5c\x3b\x70\xcb\xd9\x86\xce\x88\x4e\x0a\x1f\x6f\xa9\x9c\xc2\xe0\x0e\xe8\xd1\x43\xa4\x7d\x76\xc4\x35\xc1\x83\x9e\xc3\xb6\x5a\xae\x23\x3f\x97\xa6\xd5\xb9\x26\x0a\xb5\xa6\x3c\xee\xeb\xe3\xe6\x05\x7c\x0a\xb1\xf0\x66\x0b\x0b\xb4\x3f\x92\xcc\xe0\x81\x65\x89\xf3\xac\xfb\xeb\x82\xd8\xee\x20\xa2\x2a\xc8\xba\xe0\xe5\x6b\xf1\x6e\x58\x70\x74\x8f\x87\x67\xdc\x5c\x03\x76\x2c\xc4\x35\x26\xd6\x23\x60\x72\x9c\x5e\x37\x70\xed\x6b\x30\x7b\xa0\xf1\x33\xae\x0a\x44\x5e\x62\xf0\x6e\x56\xe0\x1a\x63\xd5\x07\x4b\x9f\x31\xf4\x0f\x86\xa7\xe1\x15\x98\xba\x07\xc9\xcb\xa8\x1b\xae\x93\x74\x3f\xf4\x0d\x7d\x10\x78\x6d\xd3\x35\x45\x44\xcf\x9f\x02\xa6\xf7\x05\xe2\xd0\x1b\x8c\x43\x4f\x6f\x73\x09\x94\x43\x5f\x37\x02\xfe\x3c\xf9\x2d\xf6\xb7\xa3\xf4\xeb\x6f\xee\xaf\x3f\x6e\xc3\xeb\x8e\xdc\x30\x98\x8b\xdf\xbc\xb9\x38\x3b\xb0\xf7\x98\xcf\x6f\xc4\x56\x5c\x6c\x74\xa1\x41\x66\xf4\x40\x69\xe4\xfa\xb3\x60\x79\x8a\x0b\x46\x68\x4b\xe4\xff\xab\x82\xef\x3a\x69\x0b\x74\x3e\x95\x1c\x80\x63\x01\x2c\x0f\x2e\xa0\xb9\x3e\xb4\x05\xe6\xc7\x40\x37\xad\xc1\xeb\x30\xb1\x81\x57\x17\xf1\x8f\xba\xa2\xf7\xad\xaa\x9a\xd5\xe7\xf3\x55\x57\x33\x9e\xd6\xb7\xba\x9c\xb9\xc0\xb9\xc4\x98\x2a\xdd\x76\xb8\x38\x63\xd9\xdd\x6c\x15\x9d\xca\xb0\x7b\x96\xab\x64\x9a\xe5\x8c\xf5\xe0\xd7\xdd\xb9\xbd\xf2\xaa\x81\x44\x91\x44\xd5\x17\xa1\x1b\x8e\x3f\x3d\xdf\x59\xf9\x86\x21\xaa\x76\x6b\xd8\xc3\x14\x85\xe4\x8a\x51\x1d\xec\x4e\x49\x06\xfb\x84\x86\x89\x0b\xde\x3b\x7c\xbf\xa8\x5c\x15\xcc\x73\x9d\x08\x49\xf5\xa5\xe0\x5c\x27\x63\x94\x2b\x0c\x73\xd9\xe1\x89\x6a\xec\xd1\x4d\xc1\xa1\x39\x73\xa0\x3c\xae\xa6\x4b\x93\xb1\xb4\xe0\x2d\xc5\xb1\x75\x45\x5d\xc1\x39\xce\x0e\xed\x31\x96\x3e\x36\x50\xc8\x98\x70\xfa\x37\xab\x2e\x57\x48\xb7\xe4\xb8\xda\xff\x6b\x44\xa8\xae\xb9\xbf\xaa\x40\x13\x97\xeb\x13\x4a\x8c\x90\x6b\x4a\x98\xbb\xca\xb0\x8b\xdd\xee\x24\xbe\xf6\xaa\x5c\xe6\x5c\xd3\x14\x9f\xdc\x9d\xb4\xec\xb9\x73\x7d\x2f\xbb\x65\x03\xf8\x40\xb7\xc8\x0e\x3e\x31\xc9\x5f\x10\xc2\xdb\x7d\x99\x04\xd6\xc2\x7c\x42\x76\x08\x29\xa1\xbc\x24\xe7\xd4\x3b\x21\x0a\xd6\x88\x1c\x22\xaa\x8c\x62\x51\x9e\x63\x04\x8a\x9a\xa3\xf1\xae\x33\x90\xf3\x63\xf0\x87\x66\x15\xba\x64\xb7\xdc\xf8\x8d\x89\x51\xad\x32\x28\xf2\xb0\x9e\x3d\xf3\x11\xda\x60\x34\x0f\x0f\x9d\x5c\x5e\x60\xc5\x90\x12\x79\x8b\xf6\xd4\x78\x48\xc4\x1e\xd2\x3c\x4c\x6c\x17\x63\x95\xf6\x84\x1a\x5c\xb1\x31\xe8\xcf\x7e\x26\x72\x77\x81\xe6\x62\xb1\x99\x14\xad\x56\xab\x93\xa9\x0e\x0d\x0a\x59\xae\x74\x93\xd6\xd4\x38\xdd\x27\x44\x5b\xb4\x67\xa0\xaa\xef\x02\x07\x91\xbf\x91\x56\x93\xec\x1d\xad\x35\x11\x19\x33\xda\x70\x5f\x62\xd5\x06\x5e\x85\x84\xc7\x0c\xb9\x4a\xe8\x46\x9f\xaf\x75\xc7\x3c\x6a\x97\xdc\x17\x18\x66\x54\x69\xcb\x6b\xed\x62\xfc\xe8\x50\xfc\xc5\x27\xd1\xda\xf8\x7b\xeb\xb4\x9a\xd3\x42\x2e\xa4\xdb\xd8\x95\xd1\x45\xe2\x15\x55\x17\x33\x82\xa0\x2b\xd2\x5d\x9b\xc2\xa2\xca\xba\x4d\x45\x3a\x66\x80\x01\x81\x18\x39\x4a\x1a\xd6\x67\xd8\xa8\x1a\x45\x8a\x75\x5b\x8b\x4b\x6e\xb6\xc8\x4d\xbb\x6f\x3f\xc0\xb5\xc3\x3b\x2e\x80\x09\x1e\xbb\x73\x44\x0b\x9a\xea\x61\x03\x0b\x1e\x3e\x8a\x9c\xeb\x27\x41\x79\xab\x75\xfe\x7f\x63\x65\x65\x1a\xfe\x5a\x4c\xe8\xde\x83\x57\x94\xc6\xe8\xb2\xe9\x78\xb6\x31\xc6\x40\x71\x56\xe8\xc1\xa1\xfd\x44\x57\xc2\x98\xb1\xf7\x78\x63\x08\x82\xe0\xd5\x93\xb0\x09\x91\xbd\x66\x61\x53\x57\x6d\xfa\xa4\xd9\xa8\x4a\xd1\x98\x17\x31\xd6\xfa\x0e\x7f\xab\x0e\x5c\x93\x2f\xad\x33\x48\xc9\x01\x76\x44\x1e\xbc\xad\x37\x76\x4b\xb8\x7c\xe1\x17\xb3\x9e\x2f\x6d\xf8\xe5\x22\x6c\x6e\x3f\xb6\x4d\x6c\xe7\xc6\x17\x76\x4a\x4d\x46\xa7\xcb\xe3\xb7\x5f\x14\x6c\x5d\x76\xf4\x05\xd3\x58\x17\x58\x3d\xf5\xd8\xdb\x41\xf0\x79\xd6\xea\x58\xa2\xd0\x84\x5f\x6c\xee\x47\x4f\x9b\xd7\x6d\x64\xaa\xf9\x38\x3d\x1c\xa7\xcf\xe5\x39\x5e\x5f\x94\x27\x0f\x89\x5a\x52\xdc\x61\x31\x03\x08\x89\x26\x4c\x34\xeb\x5f\xe7\x8d\xe3\xa5\xe4\x50\x3f\xc0\xf1\x3e\xa6\x9a\x2d\xda\x0e\xf6\xfc\x0d\x8c\x95\xbd\x0f\xfb\x9c\xb0\x6a\xa6\x91\xab\xb6\x13\x6f\x9f\x78\x5b\x2e\x69\xef\x7b\x54\x87\x9f\x4f\xc5\xe9\xb3\xeb\x5d\x4a\x12\xc4\x54\x27\xf9\x7a\xf6\xf8\xfc\xd3\xf4\xf9\xf6\xe9\x71\xfa\x34\x5f\xfd\xf9\x97\xd5\xe3\x2f\xf7\xf3\x8f\xb7\x1f\x6e\x57\xcb\x5f\xde\x3f\x7e\x78\x77\xfb\xdc\x31\x64\x0f\xcc\xdd\x33\x18\xd1\x7c\x41\xd6\xd1\x39\x93\x62\x43\x59\x83\x99\x39\x13\x83\x6f\xe9\xf3\xff\x55\xe2\x17\xc2\xe6\x87\xd9\x7a\x00\x92\x65\xec\x60\x53\x95\x0c\xc8\xd1\x92\x34\x47\x97\x1d\x06\x36\xc8\xbf\x5a\xc2\x55\x2b\x76\x2a\x86\x0a\x13\xa1\x90\xdb\x11\x72\x95\xdb\x14\x2f\x89\x36\x5d\xbe\x05\x8a\x2c\x3c\xf6\xb2\xc9\xa4\xe6\x83\x22\x12\xe6\x34\x8f\x16\x7a\x65\x47\x22\xac\x18\x48\x59\x74\xd6\x40\xf3\x9e\x13\x4d\x77\x78\x15\x0e\x2b\xd3\xe4\x2f\xc8\xf4\xc4\xef\xe9\x16\x8f\xd7\xb1\x76\x4e\xc4\xe7\xc3\xf4\xbd\x4c\x3c\xb9\x9f\x5b\x19\x72\x76\x9b\xd6\x6e\xd8\xea\x06\xd1\x46\xbe\xed\xc0\xaf\x80\x4a\x17\x20\x6a\x03\x57\x96\xa7\x45\x1d\xa5\x12\x49\x52\xd4\x28\x55\x0f\x70\xd7\x2b\xd4\xf7\x65\x72\x8c\x1e\x4f\x2c\x1c\x90\x3b\x9c\xe4\x7c\xcb\xc5\x9e\x4f\x5c\x64\x77\x06\x5a\x36\x3a\xa3\x6e\xdf\x76\x89\xc3\x4e\xee\x1a\x21\xbb\x5b\xf4\x53\xc7\xe4\x13\xb7\xaf\x4e\x7f\x87\x57\x21\xf4\x56\xae\xdb\x6a\x0b\x6c\x19\xd7\x95\xd5\x05\xb6\x4f\xad\xbe\x40\xac\xed\xca\x0c\x05\x06\x43\x81\xc1\x50\x60\x30\x14\x18\x1c\x9f\xa1\xc0\xa0\xfa\x0c\x05\x06\x43\x81\xc1\x50\x60\xd0\x45\x74\x28\x30\x68\x7b\x86\x02\x83\x8b\x33\x19\x0a\x0c\x86\x02\x83\x7a\xa3\xa1\xc0\x60\x28\x30\x18\x0a\x0c\xae\x60\x64\x28\x30\x18\x0a\x0c\x86\x02\x83\xa1\xc0\x60\xc8\x18\xfe\x0d\x66\x0c\x0f\x05\x06\x43\x81\x41\xd3\x33\x14\x18\x0c\xe6\x62\x28\x30\xb8\xaa\xd1\x50\x60\x30\x14\x18\x74\xb2\x3c\x14\x18\xf4\x1b\x75\x28\x30\x18\x0a\x0c\x5e\xcd\xcf\x50\x60\x30\x14\x18\x0c\x05\x06\x36\x76\xe1\x62\x48\x97\x32\xdb\x8e\x19\x7e\xde\xb2\xf9\x6e\x90\xa2\x86\xb7\x19\x91\x9a\x86\x39\x23\x92\x1d\x0a\x70\xbb\x4f\xb0\x69\xad\x29\x87\xdb\xe7\xe7\xc7\x67\xf7\xf5\xd0\xe7\xcc\xf6\xab\x14\x68\x48\x12\x5a\x14\x3c\xf9\x96\x6b\xef\x0c\x8a\xc4\xa2\xc6\x25\x26\xc7\xaf\xa1\x25\x1a\x48\x99\xe9\x68\xbf\x4a\xb6\xe9\x20\x73\xc9\x7f\x32\xa2\xf4\x4a\x12\xae\x2c\x2b\x2b\xda\x7e\x7a\xa9\xcd\xe7\x03\x51\xda\xab\x6c\x55\xbc\xa0\x4b\x52\x18\xb9\x84\x2e\xc1\xd1\xe7\x5e\xb5\x5b\x3f\x01\x84\xdb\x83\x46\xdb\x51\xcc\xdd\x8b\xcf\x20\x22\x1a\x27\x66\xd8\x96\x76\x17\xed\xa8\x99\xee\x27\xfb\xc5\xb9\xbd\xa7\xba\xb2\x5f\x8f\x7c\x9c\x2e\x55\x95\xf9\xee\x89\x2a\xbf\x88\xf7\xef\xcd\x7b\x8a\x4a\xb5\x66\x43\x9d\x05\x22\x93\x3c\x25\x7c\x22\x91\x44\xf6\x37\x09\x7c\x67\xa0\x3c\xb2\xa9\x1d\x3c\x86\x08\x35\xa1\xc6\x3f\xad\x45\xde\x71\x40\x48\xb0\xb2\xaa\x6d\x93\xec\x51\x92\x41\x54\xdf\x7c\x4b\xeb\xce\x4d\xf3\xf2\x27\x08\x4a\x81\xbf\x51\x7e\x2d\xbe\x9e\xa3\xa6\x84\xc0\x16\x8e\x7c\x1e\xa0\xd8\xd4\x99\x19\xbb\x9f\xe8\xd8\xc0\x4a\xe6\x38\x86\xf7\x84\x29\x1c\xc3\x27\x97\xb3\xf9\x6a\xbe\x7a\xd7\x8d\xac\x7c\x9d\x48\xf5\xcb\xec\x4b\xde\x5e\x39\x7c\x77\x26\x69\xeb\x3e\x6e\x2d\xa0\x78\x65\x99\xc4\x50\x47\x36\xd4\x91\x0d\x75\x64\x95\x06\xbd\x06\x1f\xea\xc8\xaa\xcf\x6f\xba\x8e\xcc\xc6\x85\xcf\xda\xf7\xbd\x60\xed\x9c\x62\x6d\x35\x0a\xd3\x53\xff\x71\x28\x56\x24\x20\x1e\xcf\x25\x62\xd3\xf5\x73\x1e\xc5\x53\xfe\xf8\xd1\x15\x62\x18\x4a\xe6\x86\x92\x39\x18\x4a\xe6\x4e\x04\x66\x0e\xa3\x17\xb6\x44\x91\x10\x45\xb9\x3b\xbb\xdb\x3e\xa7\x28\xa7\xfa\xdb\x42\x1b\x91\xf3\xf3\x1d\xd1\x31\xcb\xa1\x70\x6f\x28\xdc\x1b\x0a\xf7\x86\xc2\xbd\x6f\x53\xb8\xd7\x91\x1a\xd8\x1a\xb6\x2d\x7f\x9f\xcb\x77\x2d\x5d\xbb\xab\x18\xb9\x8a\xa5\x86\x0d\xd9\xc8\xeb\xd9\x87\xae\x22\xb0\xb2\xc8\x4a\x0b\x49\x62\xac\x7e\x92\xaf\xcf\xb6\xb6\x0f\x40\xc0\xff\xfc\xef\xe8\xff\x02\x00\x00\xff\xff\x74\xea\xfc\xe8\x72\x74\x00\x00"), }, "/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrations.yaml", @@ -575,6 +582,7 @@ var assets = func() http.FileSystem { }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ + fs["/.DS_Store"].(os.FileInfo), fs["/addons"].(os.FileInfo), fs["/builder"].(os.FileInfo), fs["/camel-catalog-1.12.0.yaml"].(os.FileInfo), diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go index 34cc89048a..21908ed032 100644 --- a/pkg/trait/builder.go +++ b/pkg/trait/builder.go @@ -111,8 +111,19 @@ func (t *builderTrait) Apply(e *Environment) error { }, Verbose: t.Verbose, }}) - + // nolint: staticcheck case v1.IntegrationPlatformBuildPublishStrategyKaniko: + var persistentVolumeClaim string + var found, cacheEnabled bool + if persistentVolumeClaim, found = e.Platform.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]; !found { + persistentVolumeClaim = e.Platform.Status.Build.PersistentVolumeClaim + } + + cacheEnabled = e.Platform.Status.Build.IsOptionEnabled(builder.KanikoBuildCacheEnabled) + if _, found = e.Platform.Status.Build.PublishStrategyOptions[builder.KanikoBuildCacheEnabled]; !found { + cacheEnabled = *e.Platform.Status.Build.KanikoBuildCache + } + e.BuildTasks = append(e.BuildTasks, v1.Task{Kaniko: &v1.KanikoTask{ BaseTask: v1.BaseTask{ Name: "kaniko", @@ -122,8 +133,8 @@ func (t *builderTrait) Apply(e *Environment) error { Registry: e.Platform.Status.Build.Registry, }, Cache: v1.KanikoTaskCache{ - Enabled: e.Platform.Status.Build.KanikoBuildCache, - PersistentVolumeClaim: e.Platform.Status.Build.PersistentVolumeClaim, + Enabled: &cacheEnabled, + PersistentVolumeClaim: persistentVolumeClaim, }, Verbose: t.Verbose, }}) diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go index e1bb1c9e16..577687614b 100644 --- a/pkg/trait/builder_test.go +++ b/pkg/trait/builder_test.go @@ -129,11 +129,12 @@ func createBuilderTestEnv(cluster v1.IntegrationPlatformCluster, strategy v1.Int Spec: v1.IntegrationPlatformSpec{ Cluster: cluster, Build: v1.IntegrationPlatformBuildSpec{ - PublishStrategy: strategy, - Registry: v1.RegistrySpec{Address: "registry"}, - RuntimeVersion: defaults.DefaultRuntimeVersion, - RuntimeProvider: v1.RuntimeProviderQuarkus, - KanikoBuildCache: &kanikoCache, + PublishStrategy: strategy, + Registry: v1.RegistrySpec{Address: "registry"}, + RuntimeVersion: defaults.DefaultRuntimeVersion, + RuntimeProvider: v1.RuntimeProviderQuarkus, + PublishStrategyOptions: map[string]string{}, + KanikoBuildCache: &kanikoCache, }, }, },