Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(api): refer to correct trait #3467

Merged
merged 1 commit into from
Jul 22, 2022
Merged

chore(api): refer to correct trait #3467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions config/crd/bases/camel.apache.org_integrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait (camel.properties) to manage
properties Use container trait (mount.configs) to manage configs
Use container trait (mount.resources) to manage resources Use container
trait (mount.volumes) to manage volumes'
properties Use mount trait (mount.configs) to manage configs Use
mount trait (mount.resources) to manage resources Use mount trait
(mount.volumes) to manage volumes'
items:
description: ConfigurationSpec represents a generic configuration
specification
Expand Down Expand Up @@ -167,9 +167,9 @@ spec:
type: string
type: array
resources:
description: 'Deprecated: Use container trait (container.resources)
to manage resources Use openapi trait (openapi.configmaps) to manage
OpenAPIs specifications'
description: 'Deprecated: Use mount trait (mount.resources) to manage
resources Use openapi trait (openapi.configmaps) to manage OpenAPIs
specifications'
items:
description: 'ResourceSpec represent an attached resource which
will be materialized as a file on the running `Pod` TODO: we should
Expand Down
12 changes: 6 additions & 6 deletions config/crd/bases/camel.apache.org_kameletbindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait (camel.properties) to
manage properties Use container trait (mount.configs) to manage
configs Use container trait (mount.resources) to manage resources
Use container trait (mount.volumes) to manage volumes'
manage properties Use mount trait (mount.configs) to manage
configs Use mount trait (mount.resources) to manage resources
Use mount trait (mount.volumes) to manage volumes'
items:
description: ConfigurationSpec represents a generic configuration
specification
Expand Down Expand Up @@ -172,9 +172,9 @@ spec:
type: string
type: array
resources:
description: 'Deprecated: Use container trait (container.resources)
to manage resources Use openapi trait (openapi.configmaps) to
manage OpenAPIs specifications'
description: 'Deprecated: Use mount trait (mount.resources) to
manage resources Use openapi trait (openapi.configmaps) to manage
OpenAPIs specifications'
items:
description: 'ResourceSpec represent an attached resource which
will be materialized as a file on the running `Pod` TODO:
Expand Down
8 changes: 4 additions & 4 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2034,7 +2034,7 @@ a source in YAML DSL language which contain the routes to run


Deprecated:
Use container trait (container.resources) to manage resources
Use mount trait (mount.resources) to manage resources
Use openapi trait (openapi.configmaps) to manage OpenAPIs specifications

|`integrationKit` +
Expand Down Expand Up @@ -2079,9 +2079,9 @@ Pod template customization

Deprecated:
Use camel trait (camel.properties) to manage properties
Use container trait (mount.configs) to manage configs
Use container trait (mount.resources) to manage resources
Use container trait (mount.volumes) to manage volumes
Use mount trait (mount.configs) to manage configs
Use mount trait (mount.resources) to manage resources
Use mount trait (mount.volumes) to manage volumes

|`repositories` +
[]string
Expand Down
12 changes: 6 additions & 6 deletions helm/camel-k/crds/crd-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait (camel.properties) to manage
properties Use container trait (mount.configs) to manage configs
Use container trait (mount.resources) to manage resources Use container
trait (mount.volumes) to manage volumes'
properties Use mount trait (mount.configs) to manage configs Use
mount trait (mount.resources) to manage resources Use mount trait
(mount.volumes) to manage volumes'
items:
description: ConfigurationSpec represents a generic configuration
specification
Expand Down Expand Up @@ -167,9 +167,9 @@ spec:
type: string
type: array
resources:
description: 'Deprecated: Use container trait (container.resources)
to manage resources Use openapi trait (openapi.configmaps) to manage
OpenAPIs specifications'
description: 'Deprecated: Use mount trait (mount.resources) to manage
resources Use openapi trait (openapi.configmaps) to manage OpenAPIs
specifications'
items:
description: 'ResourceSpec represent an attached resource which
will be materialized as a file on the running `Pod` TODO: we should
Expand Down
12 changes: 6 additions & 6 deletions helm/camel-k/crds/crd-kamelet-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait (camel.properties) to
manage properties Use container trait (mount.configs) to manage
configs Use container trait (mount.resources) to manage resources
Use container trait (mount.volumes) to manage volumes'
manage properties Use mount trait (mount.configs) to manage
configs Use mount trait (mount.resources) to manage resources
Use mount trait (mount.volumes) to manage volumes'
items:
description: ConfigurationSpec represents a generic configuration
specification
Expand Down Expand Up @@ -172,9 +172,9 @@ spec:
type: string
type: array
resources:
description: 'Deprecated: Use container trait (container.resources)
to manage resources Use openapi trait (openapi.configmaps) to
manage OpenAPIs specifications'
description: 'Deprecated: Use mount trait (mount.resources) to
manage resources Use openapi trait (openapi.configmaps) to manage
OpenAPIs specifications'
items:
description: 'ResourceSpec represent an attached resource which
will be materialized as a file on the running `Pod` TODO:
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/camel/v1/integration_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ type IntegrationSpec struct {
// a source in YAML DSL language which contain the routes to run
Flows []Flow `json:"flows,omitempty"`
// Deprecated:
// Use container trait (container.resources) to manage resources
// Use mount trait (mount.resources) to manage resources
// Use openapi trait (openapi.configmaps) to manage OpenAPIs specifications
Resources []ResourceSpec `json:"resources,omitempty"`
// the reference of the `IntegrationKit` which is used for this Integration
Expand All @@ -73,9 +73,9 @@ type IntegrationSpec struct {
PodTemplate *PodSpecTemplate `json:"template,omitempty"`
// Deprecated:
// Use camel trait (camel.properties) to manage properties
// Use container trait (mount.configs) to manage configs
// Use container trait (mount.resources) to manage resources
// Use container trait (mount.volumes) to manage volumes
// Use mount trait (mount.configs) to manage configs
// Use mount trait (mount.resources) to manage resources
// Use mount trait (mount.volumes) to manage volumes
Configuration []ConfigurationSpec `json:"configuration,omitempty"`
// additional Maven repositories to be used
Repositories []string `json:"repositories,omitempty"`
Expand Down