From 1387cfe08afd01db2ced5ca52cf083eda237f8c6 Mon Sep 17 00:00:00 2001 From: Pasquale Congiusti Date: Sat, 16 Nov 2024 15:37:32 +0100 Subject: [PATCH] chore(trait): hide platform trait gc --- docs/modules/ROOT/nav.adoc | 1 - docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2 +- helm/camel-k/crds/camel-k-crds.yaml | 14 +++++++------- pkg/apis/camel/v1/trait/gc.go | 9 ++------- .../camel.apache.org_integrationplatforms.yaml | 4 ++-- .../camel.apache.org_integrationprofiles.yaml | 4 ++-- .../crd/bases/camel.apache.org_integrations.yaml | 4 ++-- .../config/crd/bases/camel.apache.org_pipes.yaml | 2 +- 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index a53ea669d4..150a50bf22 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -54,7 +54,6 @@ ** xref:traits:deployer.adoc[Deployer] ** xref:traits:deployment.adoc[Deployment] ** xref:traits:environment.adoc[Environment] -** xref:traits:gc.adoc[Gc] ** xref:traits:gcp-secret-manager.adoc[Gcp Secret Manager] ** xref:traits:hashicorp-vault.adoc[Hashicorp Vault] ** xref:traits:health.adoc[Health] diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index ac92b572be..1178e6f763 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -7075,7 +7075,7 @@ The GC Trait garbage-collects all resources that are no longer necessary upon in Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). -Deprecated: to be removed from trait configuration. +Deprecated: no longer in use. |=== diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index 285ddeab8c..210c294ed2 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -4298,7 +4298,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -6487,7 +6487,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -8579,7 +8579,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -10647,7 +10647,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -19096,7 +19096,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -21091,7 +21091,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -30917,7 +30917,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk diff --git a/pkg/apis/camel/v1/trait/gc.go b/pkg/apis/camel/v1/trait/gc.go index e61b161f1a..c2e46aca0e 100644 --- a/pkg/apis/camel/v1/trait/gc.go +++ b/pkg/apis/camel/v1/trait/gc.go @@ -20,18 +20,13 @@ package trait // The GC Trait garbage-collects all resources that are no longer necessary upon integration updates. // // +camel-k:trait=gc. +// +camel-k:internal. type GCTrait struct { Trait `property:",squash" json:",inline"` // Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - // Deprecated: to be removed from trait configuration. + // Deprecated: no longer in use. DiscoveryCache *DiscoveryCacheType `property:"discovery-cache" json:"discoveryCache,omitempty"` } // +kubebuilder:validation:Enum=disabled;disk;memory type DiscoveryCacheType string - -const ( - DisabledDiscoveryCache DiscoveryCacheType = "disabled" - DiskDiscoveryCache DiscoveryCacheType = "disk" - MemoryDiscoveryCache DiscoveryCacheType = "memory" -) diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 392dd5feb6..fb199688e6 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1070,7 +1070,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -3259,7 +3259,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml index d9399a9f53..79425e7751 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml @@ -939,7 +939,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -3007,7 +3007,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml index 1c7e21e4b0..2169dc54f7 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml @@ -7299,7 +7299,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk @@ -9294,7 +9294,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk diff --git a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml index 964854bea9..16d1270da6 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml @@ -7364,7 +7364,7 @@ spec: discoveryCache: description: |- Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). - Deprecated: to be removed from trait configuration. + Deprecated: no longer in use. enum: - disabled - disk