This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 03dbca3483b309010ec65f562b7d7a4246e0c53c Author: Pasquale Congiusti <[email protected]> AuthorDate: Fri Oct 25 07:43:39 2024 +0200 chore(trait): update autogen docs --- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 7 ++++ docs/modules/traits/pages/3scale.adoc | 3 ++ docs/modules/traits/pages/aws-secrets-manager.adoc | 3 ++ docs/modules/traits/pages/azure-key-vault.adoc | 3 ++ docs/modules/traits/pages/gcp-secret-manager.adoc | 3 ++ docs/modules/traits/pages/hashicorp-vault.adoc | 3 ++ docs/modules/traits/pages/resume.adoc | 3 ++ docs/modules/traits/pages/service.adoc | 4 +++ helm/camel-k/crds/camel-k-crds.yaml | 40 ++++++++++++++++++++++ pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 7 ++++ .../camel.apache.org_integrationplatforms.yaml | 10 ++++++ .../camel.apache.org_integrationprofiles.yaml | 10 ++++++ .../crd/bases/camel.apache.org_integrations.yaml | 10 ++++++ .../bases/camel.apache.org_kameletbindings.yaml | 5 +++ .../config/crd/bases/camel.apache.org_pipes.yaml | 5 +++ 15 files changed, 116 insertions(+) diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 90560f8f7..63512e31e 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -8798,6 +8798,13 @@ map[string]string The annotations added to the Service object. +|`labels` + +map[string]string +| + + +The labels added to the Service object. + |=== diff --git a/docs/modules/traits/pages/3scale.adoc b/docs/modules/traits/pages/3scale.adoc index d6fd68d9e..247c7e0dd 100755 --- a/docs/modules/traits/pages/3scale.adoc +++ b/docs/modules/traits/pages/3scale.adoc @@ -1,6 +1,7 @@ = 3scale Trait // Start of autogenerated code - DO NOT EDIT! (badges) +image:https://img.shields.io/badge/2.5.0-white?label=Deprecated&labelColor=C40C0C&color=gray[Deprecated Badge] // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) The 3scale trait can be used to automatically create annotations that allow @@ -8,6 +9,8 @@ The 3scale trait can be used to automatically create annotations that allow The 3scale trait is disabled by default. +WARNING: The trait is **deprecated** and will removed in future release versions: configure directly the Camel properties as required by the component instead. + This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/aws-secrets-manager.adoc b/docs/modules/traits/pages/aws-secrets-manager.adoc index 96db11ead..ea4bc9170 100644 --- a/docs/modules/traits/pages/aws-secrets-manager.adoc +++ b/docs/modules/traits/pages/aws-secrets-manager.adoc @@ -1,6 +1,7 @@ = Aws Secrets Manager Trait // Start of autogenerated code - DO NOT EDIT! (badges) +image:https://img.shields.io/badge/2.5.0-white?label=Deprecated&labelColor=C40C0C&color=gray[Deprecated Badge] // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) The Secrets Manager trait can be used to use secrets from AWS Secrets Manager @@ -17,6 +18,8 @@ To enable the automatic context reload on secrets updates you should define the following trait options: -t aws-secrets-manager.enabled=true -t aws-secrets-manager.access-key="aws-access-key" -t aws-secrets-manager.secret-key="aws-secret-key" -t aws-secrets-manager.region="aws-region" -t aws-secrets-manager.context-reload-enabled="true" -t aws-secrets-manager.refresh-enabled="true" -t aws-secrets-manager.refresh-period="30000" -t aws-secrets-manager.secrets="test*" +WARNING: The trait is **deprecated** and will removed in future release versions: configure directly the Camel properties as required by the component instead. + This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/azure-key-vault.adoc b/docs/modules/traits/pages/azure-key-vault.adoc index 454e11fd7..27e76f356 100644 --- a/docs/modules/traits/pages/azure-key-vault.adoc +++ b/docs/modules/traits/pages/azure-key-vault.adoc @@ -1,6 +1,7 @@ = Azure Key Vault Trait // Start of autogenerated code - DO NOT EDIT! (badges) +image:https://img.shields.io/badge/2.5.0-white?label=Deprecated&labelColor=C40C0C&color=gray[Deprecated Badge] // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) The Azure Key Vault trait can be used to use secrets from Azure Key Vault service @@ -17,6 +18,8 @@ To enable the automatic context reload on secrets updates you should define the following trait options: -t azure-key-vault.enabled=true -t azure-key-vault.tenant-id="tenant-id" -t azure-key-vault.client-id="client-id" -t azure-key-vault.client-secret="client-secret" -t azure-key-vault.vault-name="vault-name" -t azure-key-vault.context-reload-enabled="true" -t azure-key-vault.refresh-enabled="true" -t azure-key-vault.refresh-period="30000" -t azure-key-vault.secrets="test*" -t azure-key-vault.eventhub-connection-string="connection-string" -t azure-key-vault.blob-account-name="account-name" [...] +WARNING: The trait is **deprecated** and will removed in future release versions: configure directly the Camel properties as required by the component instead. + This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/gcp-secret-manager.adoc b/docs/modules/traits/pages/gcp-secret-manager.adoc index 257f1824c..ab8952e6b 100644 --- a/docs/modules/traits/pages/gcp-secret-manager.adoc +++ b/docs/modules/traits/pages/gcp-secret-manager.adoc @@ -1,6 +1,7 @@ = Gcp Secret Manager Trait // Start of autogenerated code - DO NOT EDIT! (badges) +image:https://img.shields.io/badge/2.5.0-white?label=Deprecated&labelColor=C40C0C&color=gray[Deprecated Badge] // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) The Google Secret Manager trait can be used to use secrets from Google Secret Manager @@ -17,6 +18,8 @@ To enable the automatic context reload on secrets updates you should define the following trait options: -t gpc-secret-manager.enabled=true -t gpc-secret-manager.project-id="project-id" -t gpc-secret-manager.service-account-key="file:serviceaccount.json" -t gcp-secret-manager.subscription-name="pubsub-sub" -t gcp-secret-manager.context-reload-enabled="true" -t gcp-secret-manager.refresh-enabled="true" -t gcp-secret-manager.refresh-period="30000" -t gcp-secret-manager.secrets="test*" +WARNING: The trait is **deprecated** and will removed in future release versions: configure directly the Camel properties as required by the component instead. + This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/hashicorp-vault.adoc b/docs/modules/traits/pages/hashicorp-vault.adoc index 8adb2106b..3cb3346d7 100644 --- a/docs/modules/traits/pages/hashicorp-vault.adoc +++ b/docs/modules/traits/pages/hashicorp-vault.adoc @@ -1,6 +1,7 @@ = Hashicorp Vault Trait // Start of autogenerated code - DO NOT EDIT! (badges) +image:https://img.shields.io/badge/2.5.0-white?label=Deprecated&labelColor=C40C0C&color=gray[Deprecated Badge] // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) The Hashicorp Vault trait can be used to use secrets from Hashicorp Vault @@ -13,6 +14,8 @@ A sample execution of this trait, would require the following trait options: -t hashicorp-vault.enabled=true -t hashicorp-vault.token="token" -t hashicorp-vault.port="port" -t hashicorp-vault.engine="engine" -t hashicorp-vault.port="port" -t hashicorp-vault.scheme="scheme" +WARNING: The trait is **deprecated** and will removed in future release versions: configure directly the Camel properties as required by the component instead. + This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/resume.adoc b/docs/modules/traits/pages/resume.adoc index 779b9f1af..0af5f4502 100644 --- a/docs/modules/traits/pages/resume.adoc +++ b/docs/modules/traits/pages/resume.adoc @@ -1,6 +1,7 @@ = Resume Trait // Start of autogenerated code - DO NOT EDIT! (badges) +image:https://img.shields.io/badge/2.5.0-white?label=Deprecated&labelColor=C40C0C&color=gray[Deprecated Badge] // End of autogenerated code - DO NOT EDIT! (badges) // Start of autogenerated code - DO NOT EDIT! (description) The Resume trait can be used to manage and configure resume strategies. @@ -11,6 +12,8 @@ WARNING: this is an experimental implementation based on the support available o The Resume trait is disabled by default. +WARNING: The trait is **deprecated** and will removed in future release versions: configure directly the Camel properties as required by the component instead. + The main different from the implementation on Core is that it's not necessary to bind the strategies to the registry. This step will be done automatically by Camel K, after resolving the options passed to the trait. diff --git a/docs/modules/traits/pages/service.adoc b/docs/modules/traits/pages/service.adoc index e66dbcca0..6d72e7dce 100755 --- a/docs/modules/traits/pages/service.adoc +++ b/docs/modules/traits/pages/service.adoc @@ -49,6 +49,10 @@ Deprecated: Use service type instead. | map[string]string | The annotations added to the Service object. +| service.labels +| map[string]string +| The labels added to the Service object. + |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index fa44035de..73e14cef9 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -5232,6 +5232,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -7378,6 +7383,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -9427,6 +9437,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -11452,6 +11467,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -19518,6 +19538,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -21505,6 +21530,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -29647,6 +29677,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -40579,6 +40614,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). diff --git a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go index 36235e591..23790d11e 100644 --- a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go @@ -1163,6 +1163,13 @@ func (in *ServiceTrait) DeepCopyInto(out *ServiceTrait) { (*out)[key] = val } } + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *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 ServiceTrait. 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 fbdde54c7..776f3d80f 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -2074,6 +2074,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -4220,6 +4225,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). 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 8c88e1618..88892e8eb 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml @@ -1943,6 +1943,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -3968,6 +3973,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). 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 a319f405e..5799ff07a 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml @@ -7963,6 +7963,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). @@ -9950,6 +9955,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). diff --git a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml index fb73f10ae..1eac6998f 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -8032,6 +8032,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`). 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 9681a91a1..9f3275bf8 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml @@ -8030,6 +8030,11 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + labels: + additionalProperties: + type: string + description: The labels added to the Service object. + type: object nodePort: description: |- Enable Service to be exposed as NodePort (default `false`).
