You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/11/23 13:09:38 UTC
[camel-k] 01/03: chore: remove deprecated code
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 379c681fea68367d687082c3a5b079e4135bd0ed
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Nov 16 17:04:03 2022 +0100
chore: remove deprecated code
Closes #3787
---
config/crd/bases/camel.apache.org_builds.yaml | 137 -----------
.../crd/bases/camel.apache.org_camelcatalogs.yaml | 11 -
.../bases/camel.apache.org_integrationkits.yaml | 15 +-
.../camel.apache.org_integrationplatforms.yaml | 262 ++-------------------
.../crd/bases/camel.apache.org_integrations.yaml | 178 --------------
.../bases/camel.apache.org_kameletbindings.yaml | 131 -----------
config/crd/bases/camel.apache.org_kamelets.yaml | 8 -
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 257 ++------------------
docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 26 --
helm/camel-k/crds/crd-build.yaml | 137 -----------
helm/camel-k/crds/crd-camel-catalog.yaml | 11 -
helm/camel-k/crds/crd-integration-kit.yaml | 15 +-
helm/camel-k/crds/crd-integration-platform.yaml | 262 ++-------------------
helm/camel-k/crds/crd-integration.yaml | 178 --------------
helm/camel-k/crds/crd-kamelet-binding.yaml | 131 -----------
helm/camel-k/crds/crd-kamelet.yaml | 8 -
pkg/apis/camel/v1/build_types.go | 5 -
pkg/apis/camel/v1/camelcatalog_types.go | 3 -
pkg/apis/camel/v1/common_types.go | 8 -
pkg/apis/camel/v1/integration_types.go | 7 -
pkg/apis/camel/v1/integration_types_support.go | 32 ---
pkg/apis/camel/v1/integrationkit_types.go | 6 +-
pkg/apis/camel/v1/integrationplatform_types.go | 20 +-
pkg/apis/camel/v1/maven_types.go | 8 -
pkg/apis/camel/v1/trait/container.go | 44 ----
pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 5 -
pkg/apis/camel/v1/zz_generated.deepcopy.go | 78 +-----
pkg/apis/camel/v1alpha1/error_handler_types.go | 3 -
pkg/apis/camel/v1alpha1/kamelet_types.go | 10 -
pkg/apis/camel/v1alpha1/kamelet_types_support.go | 5 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 25 --
pkg/builder/builder.go | 25 --
pkg/builder/project.go | 3 +-
pkg/cmd/describe_integration.go | 10 -
pkg/cmd/run_test.go | 4 +-
pkg/controller/integrationplatform/initialize.go | 10 +-
pkg/controller/integrationplatform/kaniko_cache.go | 6 +-
pkg/controller/kameletbinding/error_handler.go | 3 -
pkg/kamelet/initialize.go | 2 +-
pkg/resources/resources.go | 28 +--
pkg/trait/builder.go | 12 +-
pkg/trait/builder_test.go | 2 -
pkg/trait/camel.go | 48 ----
pkg/trait/container.go | 11 +-
pkg/trait/container_probes_test.go | 32 ++-
pkg/trait/cron_test.go | 6 +-
pkg/trait/health.go | 24 --
pkg/trait/kamelets.go | 11 +-
pkg/trait/knative_service_test.go | 17 +-
pkg/trait/knative_test.go | 7 +-
pkg/trait/openapi.go | 33 +--
pkg/trait/openapi_test.go | 8 +-
pkg/trait/trait_test.go | 159 +------------
pkg/trait/trait_types.go | 27 ---
pkg/trait/util.go | 4 -
pkg/util/camel/catalog.go | 3 +-
pkg/util/digest/digest.go | 7 -
pkg/util/kubernetes/resolver.go | 26 --
58 files changed, 132 insertions(+), 2422 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml
index 67c78769b..8821ffd06 100644
--- a/config/crd/bases/camel.apache.org_builds.yaml
+++ b/config/crd/bases/camel.apache.org_builds.yaml
@@ -156,33 +156,6 @@ spec:
description: the configuration required by Maven for the
application build phase
properties:
- caSecret:
- description: 'Deprecated: use CASecrets The Secret name
- and key, containing the CA certificate(s) used to
- connect to remote Maven repositories. It can contain
- X.509 certificates, and PKCS#7 formatted certificate
- chains. A JKS formatted keystore is automatically
- created to store the CA certificate(s), and configured
- to be used as a trusted certificate(s) by the Maven
- commands. Note that the root CA certificates are also
- imported into the created keystore.'
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind,
- uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key
- must be defined
- type: boolean
- required:
- - key
- type: object
caSecrets:
description: The Secrets name and key, containing the
CA certificate(s) used to connect to remote Maven
@@ -427,49 +400,6 @@ spec:
name:
description: name of the task
type: string
- resources:
- description: 'Deprecated: no longer in use'
- items:
- description: 'ResourceSpec represent an attached resource
- which will be materialized as a file on the running
- `Pod` TODO: we should deprecate in future releases in
- favour of mount, openapi or camel traits'
- properties:
- compression:
- description: if the content is compressed (base64
- encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source
- content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
runtime:
description: the configuration required for the runtime
application
@@ -501,11 +431,6 @@ spec:
- groupId
type: object
type: array
- metadata:
- additionalProperties:
- type: string
- description: 'Deprecated: not in use'
- type: object
required:
- dependencies
type: object
@@ -550,68 +475,6 @@ spec:
- provider
- version
type: object
- sources:
- description: 'Deprecated: no longer in use the source code
- for the Route(s)'
- items:
- description: SourceSpec defines the configuration for
- one or more routes to be executed in a certain Camel
- DSL language
- properties:
- compression:
- description: if the content is compressed (base64
- encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source
- content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- interceptors:
- description: Interceptors are optional identifiers
- the org.apache.camel.k.RoutesLoader uses to pre/post
- process sources
- items:
- type: string
- type: array
- language:
- description: specify which is the language (Camel
- DSL) used to interpret this source code
- type: string
- loader:
- description: Loader is an optional id of the org.apache.camel.k.RoutesLoader
- that will interpret this source at runtime
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- property-names:
- description: List of property names defined in the
- source (e.g. if type is "template")
- items:
- type: string
- type: array
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: Type defines the kind of source described
- by this object
- type: string
- type: object
- type: array
steps:
description: the list of steps to execute (see pkg/builder/)
items:
diff --git a/config/crd/bases/camel.apache.org_camelcatalogs.yaml b/config/crd/bases/camel.apache.org_camelcatalogs.yaml
index dc89a50e4..6fb000e75 100644
--- a/config/crd/bases/camel.apache.org_camelcatalogs.yaml
+++ b/config/crd/bases/camel.apache.org_camelcatalogs.yaml
@@ -305,12 +305,6 @@ spec:
items:
type: string
type: array
- metadata:
- additionalProperties:
- type: string
- description: 'Deprecated: never used a set of general metadata
- for various purposes'
- type: object
version:
description: Maven Version
type: string
@@ -350,11 +344,6 @@ spec:
- groupId
type: object
type: array
- metadata:
- additionalProperties:
- type: string
- description: 'Deprecated: not in use'
- type: object
required:
- dependencies
type: object
diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml
index ab614da37..918cd6afe 100644
--- a/config/crd/bases/camel.apache.org_integrationkits.yaml
+++ b/config/crd/bases/camel.apache.org_integrationkits.yaml
@@ -77,21 +77,14 @@ spec:
description: the desired configuration
properties:
configuration:
- description: 'configuration used by the kit TODO: we should deprecate
- in future releases in favour of mount, openapi or camel traits'
+ description: 'Deprecated: Use camel trait (camel.properties) to 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 configuration used by the kit'
items:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index 32eba64e0..728b715e2 100644
--- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -73,6 +73,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
+ description: Generic options that can used by each publish strategy
type: object
baseImage:
description: a base image that can be used as base layer for all
@@ -86,39 +87,10 @@ spec:
- routine
- pod
type: string
- kanikoBuildCache:
- description: 'Deprecated: Use PublishStrategyOptions instead enables
- Kaniko publish strategy cache'
- type: boolean
maven:
description: Maven configuration used to build the Camel/Camel-Quarkus
applications
properties:
- caSecret:
- description: 'Deprecated: use CASecrets The Secret name and
- key, containing the CA certificate(s) used to connect to
- remote Maven repositories. It can contain X.509 certificates,
- and PKCS#7 formatted certificate chains. A JKS formatted
- keystore is automatically created to store the CA certificate(s),
- and configured to be used as a trusted certificate(s) by
- the Maven commands. Note that the root CA certificates are
- also imported into the created keystore.'
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key must
- be defined
- type: boolean
- required:
- - key
- type: object
caSecrets:
description: The Secrets name and key, containing the CA certificate(s)
used to connect to remote Maven repositories. It can contain
@@ -266,11 +238,6 @@ spec:
type: object
type: object
type: object
- persistentVolumeClaim:
- 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
base image
@@ -313,21 +280,16 @@ spec:
or OpenShift)
type: string
configuration:
- description: list of configuration properties to be attached to all
- the Integration/IntegrationKits built from this IntegrationPlatform
+ description: 'Deprecated: Use camel trait (camel.properties) to 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 list of configuration properties
+ to be attached to all the Integration/IntegrationKits built from
+ this IntegrationPlatform'
items:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -363,9 +325,6 @@ spec:
the Cluster with the optional definition of special profiles (ie,
Knative)
type: string
- resources:
- description: 'Deprecated: not used'
- type: object
traits:
description: list of traits to be executed for all the Integration/IntegrationKits
built from this IntegrationPlatform
@@ -512,41 +471,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has started
- before liveness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the liveness probe. Deprecated: replaced by the
- health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -560,47 +484,6 @@ spec:
exposed by the container. It defaults to `http` only when
the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has started
- before readiness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
@@ -1705,6 +1588,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
+ description: Generic options that can used by each publish strategy
type: object
baseImage:
description: a base image that can be used as base layer for all
@@ -1718,39 +1602,10 @@ spec:
- routine
- pod
type: string
- kanikoBuildCache:
- description: 'Deprecated: Use PublishStrategyOptions instead enables
- Kaniko publish strategy cache'
- type: boolean
maven:
description: Maven configuration used to build the Camel/Camel-Quarkus
applications
properties:
- caSecret:
- description: 'Deprecated: use CASecrets The Secret name and
- key, containing the CA certificate(s) used to connect to
- remote Maven repositories. It can contain X.509 certificates,
- and PKCS#7 formatted certificate chains. A JKS formatted
- keystore is automatically created to store the CA certificate(s),
- and configured to be used as a trusted certificate(s) by
- the Maven commands. Note that the root CA certificates are
- also imported into the created keystore.'
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key must
- be defined
- type: boolean
- required:
- - key
- type: object
caSecrets:
description: The Secrets name and key, containing the CA certificate(s)
used to connect to remote Maven repositories. It can contain
@@ -1898,11 +1753,6 @@ spec:
type: object
type: object
type: object
- persistentVolumeClaim:
- 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
base image
@@ -1979,21 +1829,16 @@ spec:
type: object
type: array
configuration:
- description: list of configuration properties to be attached to all
- the Integration/IntegrationKits built from this IntegrationPlatform
+ description: 'Deprecated: Use camel trait (camel.properties) to 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 list of configuration properties
+ to be attached to all the Integration/IntegrationKits built from
+ this IntegrationPlatform'
items:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -2043,9 +1888,6 @@ spec:
the Cluster with the optional definition of special profiles (ie,
Knative)
type: string
- resources:
- description: 'Deprecated: not used'
- type: object
traits:
description: list of traits to be executed for all the Integration/IntegrationKits
built from this IntegrationPlatform
@@ -2192,41 +2034,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has started
- before liveness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the liveness probe. Deprecated: replaced by the
- health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -2240,47 +2047,6 @@ spec:
exposed by the container. It defaults to `http` only when
the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has started
- before readiness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml
index d6e203f5d..9f95dd89f 100644
--- a/config/crd/bases/camel.apache.org_integrations.yaml
+++ b/config/crd/bases/camel.apache.org_integrations.yaml
@@ -80,15 +80,6 @@ spec:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -166,49 +157,6 @@ spec:
items:
type: string
type: array
- resources:
- 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
- deprecate in future releases in favour of mount, openapi or camel
- traits'
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
serviceAccountName:
description: custom SA to use for the Integration
type: string
@@ -6203,41 +6151,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has started
- before liveness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the liveness probe. Deprecated: replaced by the
- health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -6251,47 +6164,6 @@ spec:
exposed by the container. It defaults to `http` only when
the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has started
- before readiness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
@@ -7439,15 +7311,6 @@ spec:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -7469,47 +7332,6 @@ spec:
digest:
description: the digest calculated for this Integration
type: string
- generatedResources:
- description: 'Deprecated: a list of resources generated for this Integration'
- items:
- description: 'ResourceSpec represent an attached resource which
- will be materialized as a file on the running `Pod` TODO: we should
- deprecate in future releases in favour of mount, openapi or camel
- traits'
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
generatedSources:
description: a list of sources generated for this Integration
items:
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 99e7abac0..46e0f9ed5 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -85,15 +85,6 @@ spec:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie:
property, configmap, secret, ...'
@@ -171,49 +162,6 @@ spec:
items:
type: string
type: array
- resources:
- 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 deprecate in future releases in favour of mount,
- openapi or camel traits'
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
serviceAccountName:
description: custom SA to use for the Integration
type: string
@@ -6481,43 +6429,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe
- to be considered failed after having succeeded. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has
- started before liveness probes are initiated. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults
- to HTTP. Applies to the liveness probe. Deprecated:
- replaced by the health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe
- times out. Applies to the liveness probe. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -6531,48 +6442,6 @@ spec:
port exposed by the container. It defaults to `http`
only when the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe
- to be considered failed after having succeeded. Applies
- to the readiness probe. Deprecated: replaced by the
- health trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has
- started before readiness probes are initiated. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies
- to the readiness probe. Deprecated: replaced by the
- health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults
- to HTTP. Applies to the readiness probe. Deprecated:
- replaced by the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the
- health trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe
- times out. Applies to the readiness probe. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml
index 8f10f5f7b..7a6f89f13 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -63,9 +63,6 @@ spec:
spec:
description: the desired specification
properties:
- authorization:
- description: 'Deprecated: unused'
- type: object
definition:
description: defines the formal configuration of the Kamelet
properties:
@@ -213,11 +210,6 @@ spec:
items:
type: string
type: array
- flow:
- description: 'Deprecated: use Template instead the main source in
- YAML DSL'
- type: object
- x-kubernetes-preserve-unknown-fields: true
sources:
description: sources in any Camel DSL supported
items:
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 4012be0c0..122776fcb 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -637,21 +637,6 @@ the base image layer
the configuration required for the runtime application
-|`sources` +
-*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
-|
-
-
-Deprecated: no longer in use
-the source code for the Route(s)
-
-|`resources` +
-*xref:#_camel_apache_org_v1_ResourceSpec[[\]ResourceSpec]*
-|
-
-
-Deprecated: no longer in use
-
|`dependencies` +
[]string
|
@@ -888,14 +873,6 @@ a list of DSLs supported
a list of additional dependencies required beside the base one
-|`metadata` +
-map[string]string
-|
-
-
-Deprecated: never used
-a set of general metadata for various purposes
-
|===
@@ -996,13 +973,6 @@ Capability is a particular feature which requires a well known set of dependenci
-|`metadata` +
-map[string]string
-|
-
-
-Deprecated: not in use
-
|===
@@ -1043,27 +1013,6 @@ string
the value to assign to the configuration (syntax may vary depending on the `Type`)
-|`resourceType` +
-string
-|
-
-
-Deprecated: no longer used
-
-|`resourceMountPoint` +
-string
-|
-
-
-Deprecated: no longer used
-
-|`resourceKey` +
-string
-|
-
-
-Deprecated: no longer used
-
|===
@@ -1444,8 +1393,12 @@ traits that the kit will execute
|
+Deprecated:
+Use camel trait (camel.properties) to 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
configuration used by the kit
-TODO: we should deprecate in future releases in favour of mount, openapi or camel traits
|`repositories` +
[]string
@@ -1579,6 +1532,13 @@ IntegrationKitTraits defines traits assigned to an `IntegrationKit`
The builder trait is internally used to determine the best strategy to build and configure IntegrationKits.
+|`camel` +
+*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]*
+|
+
+
+The Camel trait sets up Camel configuration.
+
|`quarkus` +
*xref:#_camel_apache_org_v1_trait_QuarkusTrait[QuarkusTrait]*
|
@@ -1595,13 +1555,6 @@ NOTE: Compiling to a native executable, i.e. when using `package-type=native`, i
The Registry trait sets up Maven to use the Image registry as a Maven repository.
-|`camel` +
-*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]*
-|
-
-
-The Camel trait sets up Camel configuration.
-
|`addons` +
*xref:#_camel_apache_org_v1_AddonTrait[map[string\]github.com/apache/camel-k/pkg/apis/camel/v1.AddonTrait]*
|
@@ -1705,28 +1658,12 @@ how much time to wait before time out the build process
Maven configuration used to build the Camel/Camel-Quarkus applications
-|`kanikoBuildCache` +
-bool
-|
-
-
-Deprecated: Use PublishStrategyOptions instead
-enables Kaniko publish strategy cache
-
-|`persistentVolumeClaim` +
-string
-|
-
-
-Deprecated: Use PublishStrategyOptions instead
-the Persistent Volume Claim used by Kaniko publish strategy, if cache is enabled
-
|`PublishStrategyOptions` +
map[string]string
|
-
+Generic options that can used by each publish strategy
|===
@@ -1868,17 +1805,6 @@ remote repository used to retrieve Kamelet catalog
IntegrationPlatformPhase is the phase of an IntegrationPlatform
-[#_camel_apache_org_v1_IntegrationPlatformResourcesSpec]
-=== IntegrationPlatformResourcesSpec
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
-
-IntegrationPlatformResourcesSpec contains platform related resources.
-Deprecated: not used
-
-
[#_camel_apache_org_v1_IntegrationPlatformSpec]
=== IntegrationPlatformSpec
@@ -1916,13 +1842,6 @@ It usually relates the Cluster with the optional definition of special profiles
specify how to build the Integration/IntegrationKits
-|`resources` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformResourcesSpec[IntegrationPlatformResourcesSpec]*
-|
-
-
-Deprecated: not used
-
|`traits` +
*xref:#_camel_apache_org_v1_Traits[Traits]*
|
@@ -1935,6 +1854,11 @@ list of traits to be executed for all the Integration/IntegrationKits built from
|
+Deprecated:
+Use camel trait (camel.properties) to 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
list of configuration properties to be attached to all the Integration/IntegrationKits built from this IntegrationPlatform
|`kamelet` +
@@ -2042,15 +1966,6 @@ the sources which contain the Camel routes to run
a source in YAML DSL language which contain the routes to run
-|`resources` +
-*xref:#_camel_apache_org_v1_ResourceSpec[[\]ResourceSpec]*
-|
-
-
-Deprecated:
-Use mount trait (mount.resources) to manage resources
-Use openapi trait (openapi.configmaps) to manage OpenAPIs specifications
-
|`integrationKit` +
*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
|
@@ -2191,14 +2106,6 @@ The IntegrationPlatform watching this Integration
a list of sources generated for this Integration
-|`generatedResources` +
-*xref:#_camel_apache_org_v1_ResourceSpec[[\]ResourceSpec]*
-|
-
-
-Deprecated:
-a list of resources generated for this Integration
-
|`runtimeVersion` +
string
|
@@ -2484,19 +2391,6 @@ the Maven settings.
A reference to the ConfigMap or Secret key that contains
the security of the Maven settings.
-|`caSecret` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#secretkeyselector-v1-core[Kubernetes core/v1.SecretKeySelector]*
-|
-
-
-Deprecated: use CASecrets
-The Secret name and key, containing the CA certificate(s) used to connect
-to remote Maven repositories.
-It can contain X.509 certificates, and PKCS#7 formatted certificate chains.
-A JKS formatted keystore is automatically created to store the CA certificate(s),
-and configured to be used as a trusted certificate(s) by the Maven commands.
-Note that the root CA certificates are also imported into the created keystore.
-
|`caSecrets` +
*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#secretkeyselector-v1-core[[\]Kubernetes core/v1.SecretKeySelector]*
|
@@ -2873,12 +2767,6 @@ ResourceCondition is a common type for all conditions
[#_camel_apache_org_v1_ResourceSpec]
=== ResourceSpec
-*Appears on:*
-
-* <<#_camel_apache_org_v1_BuilderTask, BuilderTask>>
-* <<#_camel_apache_org_v1_IntegrationSpec, IntegrationSpec>>
-* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
-
ResourceSpec represent an attached resource which will be materialized as a file on the running `Pod`
TODO: we should deprecate in future releases in favour of mount, openapi or camel traits
@@ -3089,7 +2977,6 @@ string
*Appears on:*
-* <<#_camel_apache_org_v1_BuilderTask, BuilderTask>>
* <<#_camel_apache_org_v1_IntegrationSpec, IntegrationSpec>>
* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
@@ -3918,114 +3805,6 @@ The main container image
The pull policy: Always{vbar}Never{vbar}IfNotPresent
-|`probesEnabled` +
-bool
-|
-
-
-DeprecatedProbesEnabled enable/disable probes on the container (default `false`).
-Deprecated: replaced by the health trait.
-
-|`livenessScheme` +
-string
-|
-
-
-Scheme to use when connecting. Defaults to HTTP. Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-|`livenessInitialDelay` +
-int32
-|
-
-
-Number of seconds after the container has started before liveness probes are initiated.
-Deprecated: replaced by the health trait.
-
-|`livenessTimeout` +
-int32
-|
-
-
-Number of seconds after which the probe times out. Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-|`livenessPeriod` +
-int32
-|
-
-
-How often to perform the probe. Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-|`livenessSuccessThreshold` +
-int32
-|
-
-
-Minimum consecutive successes for the probe to be considered successful after having failed.
-Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-|`livenessFailureThreshold` +
-int32
-|
-
-
-Minimum consecutive failures for the probe to be considered failed after having succeeded.
-Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-|`readinessScheme` +
-string
-|
-
-
-Scheme to use when connecting. Defaults to HTTP. Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-|`readinessInitialDelay` +
-int32
-|
-
-
-Number of seconds after the container has started before readiness probes are initiated.
-Deprecated: replaced by the health trait.
-
-|`readinessTimeout` +
-int32
-|
-
-
-Number of seconds after which the probe times out. Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-|`readinessPeriod` +
-int32
-|
-
-
-How often to perform the probe. Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-|`readinessSuccessThreshold` +
-int32
-|
-
-
-Minimum consecutive successes for the probe to be considered successful after having failed.
-Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-|`readinessFailureThreshold` +
-int32
-|
-
-
-Minimum consecutive failures for the probe to be considered failed after having succeeded.
-Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
|===
diff --git a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
index 04aab42a9..5c9c4573c 100644
--- a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
@@ -91,17 +91,6 @@ the status of a KameletBinding
== Internal Types
-[#_camel_apache_org_v1alpha1_AuthorizationSpec]
-=== AuthorizationSpec
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_KameletSpec, KameletSpec>>
-
-AuthorizationSpec is TODO (oauth information)
-Deprecated: unused
-
-
[#_camel_apache_org_v1alpha1_BeanProperties]
=== BeanProperties
@@ -1057,21 +1046,6 @@ sources in any Camel DSL supported
the main source in YAML DSL
-|`flow` +
-*xref:apis/camel-k.adoc#_camel_apache_org_v1_Flow[github.com/apache/camel-k/pkg/apis/camel/v1.Flow]*
-|
-
-
-Deprecated: use Template instead
-the main source in YAML DSL
-
-|`authorization` +
-*xref:#_camel_apache_org_v1alpha1_AuthorizationSpec[AuthorizationSpec]*
-|
-
-
-Deprecated: unused
-
|`types` +
*xref:#_camel_apache_org_v1alpha1_EventTypeSpec[map[github.com/apache/camel-k/pkg/apis/camel/v1alpha1.EventSlot\]github.com/apache/camel-k/pkg/apis/camel/v1alpha1.EventTypeSpec]*
|
diff --git a/helm/camel-k/crds/crd-build.yaml b/helm/camel-k/crds/crd-build.yaml
index 67c78769b..8821ffd06 100644
--- a/helm/camel-k/crds/crd-build.yaml
+++ b/helm/camel-k/crds/crd-build.yaml
@@ -156,33 +156,6 @@ spec:
description: the configuration required by Maven for the
application build phase
properties:
- caSecret:
- description: 'Deprecated: use CASecrets The Secret name
- and key, containing the CA certificate(s) used to
- connect to remote Maven repositories. It can contain
- X.509 certificates, and PKCS#7 formatted certificate
- chains. A JKS formatted keystore is automatically
- created to store the CA certificate(s), and configured
- to be used as a trusted certificate(s) by the Maven
- commands. Note that the root CA certificates are also
- imported into the created keystore.'
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind,
- uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key
- must be defined
- type: boolean
- required:
- - key
- type: object
caSecrets:
description: The Secrets name and key, containing the
CA certificate(s) used to connect to remote Maven
@@ -427,49 +400,6 @@ spec:
name:
description: name of the task
type: string
- resources:
- description: 'Deprecated: no longer in use'
- items:
- description: 'ResourceSpec represent an attached resource
- which will be materialized as a file on the running
- `Pod` TODO: we should deprecate in future releases in
- favour of mount, openapi or camel traits'
- properties:
- compression:
- description: if the content is compressed (base64
- encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source
- content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
runtime:
description: the configuration required for the runtime
application
@@ -501,11 +431,6 @@ spec:
- groupId
type: object
type: array
- metadata:
- additionalProperties:
- type: string
- description: 'Deprecated: not in use'
- type: object
required:
- dependencies
type: object
@@ -550,68 +475,6 @@ spec:
- provider
- version
type: object
- sources:
- description: 'Deprecated: no longer in use the source code
- for the Route(s)'
- items:
- description: SourceSpec defines the configuration for
- one or more routes to be executed in a certain Camel
- DSL language
- properties:
- compression:
- description: if the content is compressed (base64
- encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source
- content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- interceptors:
- description: Interceptors are optional identifiers
- the org.apache.camel.k.RoutesLoader uses to pre/post
- process sources
- items:
- type: string
- type: array
- language:
- description: specify which is the language (Camel
- DSL) used to interpret this source code
- type: string
- loader:
- description: Loader is an optional id of the org.apache.camel.k.RoutesLoader
- that will interpret this source at runtime
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- property-names:
- description: List of property names defined in the
- source (e.g. if type is "template")
- items:
- type: string
- type: array
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: Type defines the kind of source described
- by this object
- type: string
- type: object
- type: array
steps:
description: the list of steps to execute (see pkg/builder/)
items:
diff --git a/helm/camel-k/crds/crd-camel-catalog.yaml b/helm/camel-k/crds/crd-camel-catalog.yaml
index dc89a50e4..6fb000e75 100644
--- a/helm/camel-k/crds/crd-camel-catalog.yaml
+++ b/helm/camel-k/crds/crd-camel-catalog.yaml
@@ -305,12 +305,6 @@ spec:
items:
type: string
type: array
- metadata:
- additionalProperties:
- type: string
- description: 'Deprecated: never used a set of general metadata
- for various purposes'
- type: object
version:
description: Maven Version
type: string
@@ -350,11 +344,6 @@ spec:
- groupId
type: object
type: array
- metadata:
- additionalProperties:
- type: string
- description: 'Deprecated: not in use'
- type: object
required:
- dependencies
type: object
diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml
index ab614da37..918cd6afe 100644
--- a/helm/camel-k/crds/crd-integration-kit.yaml
+++ b/helm/camel-k/crds/crd-integration-kit.yaml
@@ -77,21 +77,14 @@ spec:
description: the desired configuration
properties:
configuration:
- description: 'configuration used by the kit TODO: we should deprecate
- in future releases in favour of mount, openapi or camel traits'
+ description: 'Deprecated: Use camel trait (camel.properties) to 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 configuration used by the kit'
items:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml
index 32eba64e0..728b715e2 100644
--- a/helm/camel-k/crds/crd-integration-platform.yaml
+++ b/helm/camel-k/crds/crd-integration-platform.yaml
@@ -73,6 +73,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
+ description: Generic options that can used by each publish strategy
type: object
baseImage:
description: a base image that can be used as base layer for all
@@ -86,39 +87,10 @@ spec:
- routine
- pod
type: string
- kanikoBuildCache:
- description: 'Deprecated: Use PublishStrategyOptions instead enables
- Kaniko publish strategy cache'
- type: boolean
maven:
description: Maven configuration used to build the Camel/Camel-Quarkus
applications
properties:
- caSecret:
- description: 'Deprecated: use CASecrets The Secret name and
- key, containing the CA certificate(s) used to connect to
- remote Maven repositories. It can contain X.509 certificates,
- and PKCS#7 formatted certificate chains. A JKS formatted
- keystore is automatically created to store the CA certificate(s),
- and configured to be used as a trusted certificate(s) by
- the Maven commands. Note that the root CA certificates are
- also imported into the created keystore.'
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key must
- be defined
- type: boolean
- required:
- - key
- type: object
caSecrets:
description: The Secrets name and key, containing the CA certificate(s)
used to connect to remote Maven repositories. It can contain
@@ -266,11 +238,6 @@ spec:
type: object
type: object
type: object
- persistentVolumeClaim:
- 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
base image
@@ -313,21 +280,16 @@ spec:
or OpenShift)
type: string
configuration:
- description: list of configuration properties to be attached to all
- the Integration/IntegrationKits built from this IntegrationPlatform
+ description: 'Deprecated: Use camel trait (camel.properties) to 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 list of configuration properties
+ to be attached to all the Integration/IntegrationKits built from
+ this IntegrationPlatform'
items:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -363,9 +325,6 @@ spec:
the Cluster with the optional definition of special profiles (ie,
Knative)
type: string
- resources:
- description: 'Deprecated: not used'
- type: object
traits:
description: list of traits to be executed for all the Integration/IntegrationKits
built from this IntegrationPlatform
@@ -512,41 +471,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has started
- before liveness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the liveness probe. Deprecated: replaced by the
- health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -560,47 +484,6 @@ spec:
exposed by the container. It defaults to `http` only when
the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has started
- before readiness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
@@ -1705,6 +1588,7 @@ spec:
PublishStrategyOptions:
additionalProperties:
type: string
+ description: Generic options that can used by each publish strategy
type: object
baseImage:
description: a base image that can be used as base layer for all
@@ -1718,39 +1602,10 @@ spec:
- routine
- pod
type: string
- kanikoBuildCache:
- description: 'Deprecated: Use PublishStrategyOptions instead enables
- Kaniko publish strategy cache'
- type: boolean
maven:
description: Maven configuration used to build the Camel/Camel-Quarkus
applications
properties:
- caSecret:
- description: 'Deprecated: use CASecrets The Secret name and
- key, containing the CA certificate(s) used to connect to
- remote Maven repositories. It can contain X.509 certificates,
- and PKCS#7 formatted certificate chains. A JKS formatted
- keystore is automatically created to store the CA certificate(s),
- and configured to be used as a trusted certificate(s) by
- the Maven commands. Note that the root CA certificates are
- also imported into the created keystore.'
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key must
- be defined
- type: boolean
- required:
- - key
- type: object
caSecrets:
description: The Secrets name and key, containing the CA certificate(s)
used to connect to remote Maven repositories. It can contain
@@ -1898,11 +1753,6 @@ spec:
type: object
type: object
type: object
- persistentVolumeClaim:
- 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
base image
@@ -1979,21 +1829,16 @@ spec:
type: object
type: array
configuration:
- description: list of configuration properties to be attached to all
- the Integration/IntegrationKits built from this IntegrationPlatform
+ description: 'Deprecated: Use camel trait (camel.properties) to 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 list of configuration properties
+ to be attached to all the Integration/IntegrationKits built from
+ this IntegrationPlatform'
items:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -2043,9 +1888,6 @@ spec:
the Cluster with the optional definition of special profiles (ie,
Knative)
type: string
- resources:
- description: 'Deprecated: not used'
- type: object
traits:
description: list of traits to be executed for all the Integration/IntegrationKits
built from this IntegrationPlatform
@@ -2192,41 +2034,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has started
- before liveness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the liveness probe. Deprecated: replaced by the
- health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -2240,47 +2047,6 @@ spec:
exposed by the container. It defaults to `http` only when
the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has started
- before readiness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
index d6e203f5d..9f95dd89f 100644
--- a/helm/camel-k/crds/crd-integration.yaml
+++ b/helm/camel-k/crds/crd-integration.yaml
@@ -80,15 +80,6 @@ spec:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -166,49 +157,6 @@ spec:
items:
type: string
type: array
- resources:
- 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
- deprecate in future releases in favour of mount, openapi or camel
- traits'
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
serviceAccountName:
description: custom SA to use for the Integration
type: string
@@ -6203,41 +6151,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has started
- before liveness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the liveness probe. Deprecated: replaced by the
- health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -6251,47 +6164,6 @@ spec:
exposed by the container. It defaults to `http` only when
the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe to
- be considered failed after having succeeded. Applies to
- the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has started
- before readiness probes are initiated. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults to HTTP.
- Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe times
- out. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
@@ -7439,15 +7311,6 @@ spec:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie: property,
configmap, secret, ...'
@@ -7469,47 +7332,6 @@ spec:
digest:
description: the digest calculated for this Integration
type: string
- generatedResources:
- description: 'Deprecated: a list of resources generated for this Integration'
- items:
- description: 'ResourceSpec represent an attached resource which
- will be materialized as a file on the running `Pod` TODO: we should
- deprecate in future releases in favour of mount, openapi or camel
- traits'
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
generatedSources:
description: a list of sources generated for this Integration
items:
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index 99e7abac0..46e0f9ed5 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -85,15 +85,6 @@ spec:
description: ConfigurationSpec represents a generic configuration
specification
properties:
- resourceKey:
- description: 'Deprecated: no longer used'
- type: string
- resourceMountPoint:
- description: 'Deprecated: no longer used'
- type: string
- resourceType:
- description: 'Deprecated: no longer used'
- type: string
type:
description: 'represents the type of configuration, ie:
property, configmap, secret, ...'
@@ -171,49 +162,6 @@ spec:
items:
type: string
type: array
- resources:
- 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 deprecate in future releases in favour of mount,
- openapi or camel traits'
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- mountPath:
- description: the mount path on destination `Pod`
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: the kind of data to expect
- type: string
- type: object
- type: array
serviceAccountName:
description: custom SA to use for the Integration
type: string
@@ -6481,43 +6429,6 @@ spec:
limitMemory:
description: The maximum amount of memory required.
type: string
- livenessFailureThreshold:
- description: 'Minimum consecutive failures for the probe
- to be considered failed after having succeeded. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessInitialDelay:
- description: 'Number of seconds after the container has
- started before liveness probes are initiated. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
- livenessPeriod:
- description: 'How often to perform the probe. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessScheme:
- description: 'Scheme to use when connecting. Defaults
- to HTTP. Applies to the liveness probe. Deprecated:
- replaced by the health trait.'
- type: string
- livenessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the liveness probe. Deprecated: replaced by the health
- trait.'
- format: int32
- type: integer
- livenessTimeout:
- description: 'Number of seconds after which the probe
- times out. Applies to the liveness probe. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
name:
description: The main container name. It's named `integration`
by default.
@@ -6531,48 +6442,6 @@ spec:
port exposed by the container. It defaults to `http`
only when the `expose` parameter is true.
type: string
- probesEnabled:
- description: 'DeprecatedProbesEnabled enable/disable probes
- on the container (default `false`). Deprecated: replaced
- by the health trait.'
- type: boolean
- readinessFailureThreshold:
- description: 'Minimum consecutive failures for the probe
- to be considered failed after having succeeded. Applies
- to the readiness probe. Deprecated: replaced by the
- health trait.'
- format: int32
- type: integer
- readinessInitialDelay:
- description: 'Number of seconds after the container has
- started before readiness probes are initiated. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
- readinessPeriod:
- description: 'How often to perform the probe. Applies
- to the readiness probe. Deprecated: replaced by the
- health trait.'
- format: int32
- type: integer
- readinessScheme:
- description: 'Scheme to use when connecting. Defaults
- to HTTP. Applies to the readiness probe. Deprecated:
- replaced by the health trait.'
- type: string
- readinessSuccessThreshold:
- description: 'Minimum consecutive successes for the probe
- to be considered successful after having failed. Applies
- to the readiness probe. Deprecated: replaced by the
- health trait.'
- format: int32
- type: integer
- readinessTimeout:
- description: 'Number of seconds after which the probe
- times out. Applies to the readiness probe. Deprecated:
- replaced by the health trait.'
- format: int32
- type: integer
requestCPU:
description: The minimum amount of CPU required.
type: string
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
index 8f10f5f7b..7a6f89f13 100644
--- a/helm/camel-k/crds/crd-kamelet.yaml
+++ b/helm/camel-k/crds/crd-kamelet.yaml
@@ -63,9 +63,6 @@ spec:
spec:
description: the desired specification
properties:
- authorization:
- description: 'Deprecated: unused'
- type: object
definition:
description: defines the formal configuration of the Kamelet
properties:
@@ -213,11 +210,6 @@ spec:
items:
type: string
type: array
- flow:
- description: 'Deprecated: use Template instead the main source in
- YAML DSL'
- type: object
- x-kubernetes-preserve-unknown-fields: true
sources:
description: sources in any Camel DSL supported
items:
diff --git a/pkg/apis/camel/v1/build_types.go b/pkg/apis/camel/v1/build_types.go
index d79c4fa19..675472984 100644
--- a/pkg/apis/camel/v1/build_types.go
+++ b/pkg/apis/camel/v1/build_types.go
@@ -66,11 +66,6 @@ type BuilderTask struct {
BaseImage string `json:"baseImage,omitempty"`
// the configuration required for the runtime application
Runtime RuntimeSpec `json:"runtime,omitempty"`
- // Deprecated: no longer in use
- // the source code for the Route(s)
- Sources []SourceSpec `json:"sources,omitempty"`
- // Deprecated: no longer in use
- Resources []ResourceSpec `json:"resources,omitempty"`
// the list of dependencies to use for this build
Dependencies []string `json:"dependencies,omitempty"`
// the list of steps to execute (see pkg/builder/)
diff --git a/pkg/apis/camel/v1/camelcatalog_types.go b/pkg/apis/camel/v1/camelcatalog_types.go
index fc5f488b5..09f1fb1e3 100644
--- a/pkg/apis/camel/v1/camelcatalog_types.go
+++ b/pkg/apis/camel/v1/camelcatalog_types.go
@@ -128,7 +128,4 @@ type CamelLoader struct {
Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"`
// a list of additional dependencies required beside the base one
Dependencies []MavenArtifact `json:"dependencies,omitempty" yaml:"dependencies,omitempty"`
- // Deprecated: never used
- // a set of general metadata for various purposes
- Metadata map[string]string `json:"metadata,omitempty" yaml:"metadata,omitempty"`
}
diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
index d24d8c45f..c30be28de 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -62,12 +62,6 @@ type ConfigurationSpec struct {
Type string `json:"type"`
// the value to assign to the configuration (syntax may vary depending on the `Type`)
Value string `json:"value"`
- // Deprecated: no longer used
- ResourceType string `json:"resourceType,omitempty"`
- // Deprecated: no longer used
- ResourceMountPoint string `json:"resourceMountPoint,omitempty"`
- // Deprecated: no longer used
- ResourceKey string `json:"resourceKey,omitempty"`
}
// Artifact represents a materialized artifact (a jar dependency or in general a file used by the build)
@@ -282,8 +276,6 @@ type RuntimeSpec struct {
// Capability is a particular feature which requires a well known set of dependencies
type Capability struct {
Dependencies []MavenArtifact `json:"dependencies" yaml:"dependencies"`
- // Deprecated: not in use
- Metadata map[string]string `json:"metadata,omitempty" yaml:"metadata,omitempty"`
}
const (
diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go
index 921b2d74f..6d5542c1f 100644
--- a/pkg/apis/camel/v1/integration_types.go
+++ b/pkg/apis/camel/v1/integration_types.go
@@ -57,10 +57,6 @@ type IntegrationSpec struct {
Sources []SourceSpec `json:"sources,omitempty"`
// a source in YAML DSL language which contain the routes to run
Flows []Flow `json:"flows,omitempty"`
- // Deprecated:
- // 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
IntegrationKit *corev1.ObjectReference `json:"integrationKit,omitempty"`
// the list of Camel or Maven dependencies required by the Integration
@@ -103,9 +99,6 @@ type IntegrationStatus struct {
Platform string `json:"platform,omitempty"`
// a list of sources generated for this Integration
GeneratedSources []SourceSpec `json:"generatedSources,omitempty"`
- // Deprecated:
- // a list of resources generated for this Integration
- GeneratedResources []ResourceSpec `json:"generatedResources,omitempty"`
// the runtime version targeted for this Integration
RuntimeVersion string `json:"runtimeVersion,omitempty"`
// the runtime provider targeted for this Integration
diff --git a/pkg/apis/camel/v1/integration_types_support.go b/pkg/apis/camel/v1/integration_types_support.go
index 8eb70ef8b..b86319ae6 100644
--- a/pkg/apis/camel/v1/integration_types_support.go
+++ b/pkg/apis/camel/v1/integration_types_support.go
@@ -69,15 +69,6 @@ func (in *Integration) Sources() []SourceSpec {
return sources
}
-// Resources return a new slice containing all the resources associated to the integration
-func (in *Integration) Resources() []ResourceSpec {
- resources := make([]ResourceSpec, 0, len(in.Spec.Resources)+len(in.Status.GeneratedResources))
- resources = append(resources, in.Spec.Resources...)
- resources = append(resources, in.Status.GeneratedResources...)
-
- return resources
-}
-
func (in *IntegrationSpec) AddSource(name string, content string, language Language) {
in.Sources = append(in.Sources, NewSourceSpec(name, content, language))
}
@@ -86,10 +77,6 @@ func (in *IntegrationSpec) AddSources(sources ...SourceSpec) {
in.Sources = append(in.Sources, sources...)
}
-func (in *IntegrationSpec) AddResources(resources ...ResourceSpec) {
- in.Resources = append(in.Resources, resources...)
-}
-
func (in *IntegrationSpec) AddFlows(flows ...Flow) {
in.Flows = append(in.Flows, flows...)
}
@@ -133,25 +120,6 @@ func trimFirstLeadingSpace(val string) string {
return val
}
-func (in *IntegrationStatus) AddOrReplaceGeneratedResources(resources ...ResourceSpec) {
- newResources := make([]ResourceSpec, 0)
- for _, resource := range resources {
- replaced := false
- for i, r := range in.GeneratedResources {
- if r.Name == resource.Name {
- in.GeneratedResources[i] = resource
- replaced = true
- break
- }
- }
- if !replaced {
- newResources = append(newResources, resource)
- }
- }
-
- in.GeneratedResources = append(in.GeneratedResources, newResources...)
-}
-
func (in *IntegrationStatus) AddOrReplaceGeneratedSources(sources ...SourceSpec) {
newSources := make([]SourceSpec, 0)
for _, source := range sources {
diff --git a/pkg/apis/camel/v1/integrationkit_types.go b/pkg/apis/camel/v1/integrationkit_types.go
index c7efc896e..a94506388 100644
--- a/pkg/apis/camel/v1/integrationkit_types.go
+++ b/pkg/apis/camel/v1/integrationkit_types.go
@@ -60,8 +60,12 @@ type IntegrationKitSpec struct {
Profile TraitProfile `json:"profile,omitempty"`
// traits that the kit will execute
Traits IntegrationKitTraits `json:"traits,omitempty"`
+ // Deprecated:
+ // Use camel trait (camel.properties) to 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
// configuration used by the kit
- // TODO: we should deprecate in future releases in favour of mount, openapi or camel traits
Configuration []ConfigurationSpec `json:"configuration,omitempty"`
// Maven repositories that can be used by the kit
Repositories []string `json:"repositories,omitempty"`
diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go
index 261f72c3a..0c378f9c7 100644
--- a/pkg/apis/camel/v1/integrationplatform_types.go
+++ b/pkg/apis/camel/v1/integrationplatform_types.go
@@ -34,21 +34,19 @@ type IntegrationPlatformSpec struct {
Profile TraitProfile `json:"profile,omitempty"`
// specify how to build the Integration/IntegrationKits
Build IntegrationPlatformBuildSpec `json:"build,omitempty"`
- // Deprecated: not used
- Resources IntegrationPlatformResourcesSpec `json:"resources,omitempty"`
// list of traits to be executed for all the Integration/IntegrationKits built from this IntegrationPlatform
Traits Traits `json:"traits,omitempty"`
+ // Deprecated:
+ // Use camel trait (camel.properties) to 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
// list of configuration properties to be attached to all the Integration/IntegrationKits built from this IntegrationPlatform
Configuration []ConfigurationSpec `json:"configuration,omitempty"`
// configuration to be executed to all Kamelets controlled by this IntegrationPlatform
Kamelet IntegrationPlatformKameletSpec `json:"kamelet,omitempty"`
}
-// IntegrationPlatformResourcesSpec contains platform related resources.
-// Deprecated: not used
-type IntegrationPlatformResourcesSpec struct {
-}
-
// IntegrationPlatformStatus defines the observed state of IntegrationPlatform
type IntegrationPlatformStatus struct {
IntegrationPlatformSpec `json:",inline"`
@@ -126,13 +124,7 @@ 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"`
- // Deprecated: Use PublishStrategyOptions instead
- //the Persistent Volume Claim used by Kaniko publish strategy, if cache is enabled
- PersistentVolumeClaim string `json:"persistentVolumeClaim,omitempty"`
- //
+ // Generic options that can used by each publish strategy
PublishStrategyOptions map[string]string `json:"PublishStrategyOptions,omitempty"`
}
diff --git a/pkg/apis/camel/v1/maven_types.go b/pkg/apis/camel/v1/maven_types.go
index 252cc3166..1d55cb3fd 100644
--- a/pkg/apis/camel/v1/maven_types.go
+++ b/pkg/apis/camel/v1/maven_types.go
@@ -35,14 +35,6 @@ type MavenSpec struct {
// A reference to the ConfigMap or Secret key that contains
// the security of the Maven settings.
SettingsSecurity ValueSource `json:"settingsSecurity,omitempty"`
- // Deprecated: use CASecrets
- // The Secret name and key, containing the CA certificate(s) used to connect
- // to remote Maven repositories.
- // It can contain X.509 certificates, and PKCS#7 formatted certificate chains.
- // A JKS formatted keystore is automatically created to store the CA certificate(s),
- // and configured to be used as a trusted certificate(s) by the Maven commands.
- // Note that the root CA certificates are also imported into the created keystore.
- CASecret *corev1.SecretKeySelector `json:"caSecret,omitempty"`
// The Secrets name and key, containing the CA certificate(s) used to connect
// to remote Maven repositories.
// It can contain X.509 certificates, and PKCS#7 formatted certificate chains.
diff --git a/pkg/apis/camel/v1/trait/container.go b/pkg/apis/camel/v1/trait/container.go
index d05252c43..f33c4f74a 100644
--- a/pkg/apis/camel/v1/trait/container.go
+++ b/pkg/apis/camel/v1/trait/container.go
@@ -57,48 +57,4 @@ type ContainerTrait struct {
// The pull policy: Always|Never|IfNotPresent
// +kubebuilder:validation:Enum=Always;Never;IfNotPresent
ImagePullPolicy corev1.PullPolicy `property:"image-pull-policy" json:"imagePullPolicy,omitempty"`
-
- // DeprecatedProbesEnabled enable/disable probes on the container (default `false`).
- // Deprecated: replaced by the health trait.
- DeprecatedProbesEnabled *bool `property:"probes-enabled" json:"probesEnabled,omitempty"`
- // Scheme to use when connecting. Defaults to HTTP. Applies to the liveness probe.
- // Deprecated: replaced by the health trait.
- DeprecatedLivenessScheme string `property:"liveness-scheme" json:"livenessScheme,omitempty"`
- // Number of seconds after the container has started before liveness probes are initiated.
- // Deprecated: replaced by the health trait.
- DeprecatedLivenessInitialDelay int32 `property:"liveness-initial-delay" json:"livenessInitialDelay,omitempty"`
- // Number of seconds after which the probe times out. Applies to the liveness probe.
- // Deprecated: replaced by the health trait.
- DeprecatedLivenessTimeout int32 `property:"liveness-timeout" json:"livenessTimeout,omitempty"`
- // How often to perform the probe. Applies to the liveness probe.
- // Deprecated: replaced by the health trait.
- DeprecatedLivenessPeriod 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.
- // Deprecated: replaced by the health trait.
- DeprecatedLivenessSuccessThreshold 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.
- // Deprecated: replaced by the health trait.
- DeprecatedLivenessFailureThreshold int32 `property:"liveness-failure-threshold" json:"livenessFailureThreshold,omitempty"`
- // Scheme to use when connecting. Defaults to HTTP. Applies to the readiness probe.
- // Deprecated: replaced by the health trait.
- DeprecatedReadinessScheme string `property:"readiness-scheme" json:"readinessScheme,omitempty"`
- // Number of seconds after the container has started before readiness probes are initiated.
- // Deprecated: replaced by the health trait.
- DeprecatedReadinessInitialDelay int32 `property:"readiness-initial-delay" json:"readinessInitialDelay,omitempty"`
- // Number of seconds after which the probe times out. Applies to the readiness probe.
- // Deprecated: replaced by the health trait.
- DeprecatedReadinessTimeout int32 `property:"readiness-timeout" json:"readinessTimeout,omitempty"`
- // How often to perform the probe. Applies to the readiness probe.
- // Deprecated: replaced by the health trait.
- DeprecatedReadinessPeriod 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.
- // Deprecated: replaced by the health trait.
- DeprecatedReadinessSuccessThreshold 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.
- // Deprecated: replaced by the health trait.
- DeprecatedReadinessFailureThreshold int32 `property:"readiness-failure-threshold" json:"readinessFailureThreshold,omitempty"`
}
diff --git a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
index f64b62a03..f8831364e 100644
--- a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
@@ -129,11 +129,6 @@ func (in *ContainerTrait) DeepCopyInto(out *ContainerTrait) {
*out = new(bool)
**out = **in
}
- if in.DeprecatedProbesEnabled != nil {
- in, out := &in.DeprecatedProbesEnabled, &out.DeprecatedProbesEnabled
- *out = new(bool)
- **out = **in
- }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerTrait.
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index d4d0b3e4b..7aa25d965 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -224,20 +224,6 @@ 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))
@@ -460,13 +446,6 @@ func (in *CamelLoader) DeepCopyInto(out *CamelLoader) {
*out = make([]MavenArtifact, len(*in))
copy(*out, *in)
}
- if in.Metadata != nil {
- in, out := &in.Metadata, &out.Metadata
- *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 CamelLoader.
@@ -526,13 +505,6 @@ func (in *Capability) DeepCopyInto(out *Capability) {
*out = make([]MavenArtifact, len(*in))
copy(*out, *in)
}
- if in.Metadata != nil {
- in, out := &in.Metadata, &out.Metadata
- *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 Capability.
@@ -828,6 +800,11 @@ func (in *IntegrationKitTraits) DeepCopyInto(out *IntegrationKitTraits) {
*out = new(trait.BuilderTrait)
(*in).DeepCopyInto(*out)
}
+ if in.Camel != nil {
+ in, out := &in.Camel, &out.Camel
+ *out = new(trait.CamelTrait)
+ (*in).DeepCopyInto(*out)
+ }
if in.Quarkus != nil {
in, out := &in.Quarkus, &out.Quarkus
*out = new(trait.QuarkusTrait)
@@ -838,11 +815,6 @@ func (in *IntegrationKitTraits) DeepCopyInto(out *IntegrationKitTraits) {
*out = new(trait.RegistryTrait)
(*in).DeepCopyInto(*out)
}
- if in.Camel != nil {
- in, out := &in.Camel, &out.Camel
- *out = new(trait.CamelTrait)
- (*in).DeepCopyInto(*out)
- }
if in.Addons != nil {
in, out := &in.Addons, &out.Addons
*out = make(map[string]AddonTrait, len(*in))
@@ -931,11 +903,6 @@ func (in *IntegrationPlatformBuildSpec) DeepCopyInto(out *IntegrationPlatformBui
**out = **in
}
in.Maven.DeepCopyInto(&out.Maven)
- if in.KanikoBuildCache != nil {
- in, out := &in.KanikoBuildCache, &out.KanikoBuildCache
- *out = new(bool)
- **out = **in
- }
if in.PublishStrategyOptions != nil {
in, out := &in.PublishStrategyOptions, &out.PublishStrategyOptions
*out = make(map[string]string, len(*in))
@@ -1039,26 +1006,10 @@ func (in *IntegrationPlatformList) DeepCopyObject() runtime.Object {
return nil
}
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *IntegrationPlatformResourcesSpec) DeepCopyInto(out *IntegrationPlatformResourcesSpec) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IntegrationPlatformResourcesSpec.
-func (in *IntegrationPlatformResourcesSpec) DeepCopy() *IntegrationPlatformResourcesSpec {
- if in == nil {
- return nil
- }
- out := new(IntegrationPlatformResourcesSpec)
- in.DeepCopyInto(out)
- return out
-}
-
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *IntegrationPlatformSpec) DeepCopyInto(out *IntegrationPlatformSpec) {
*out = *in
in.Build.DeepCopyInto(&out.Build)
- out.Resources = in.Resources
in.Traits.DeepCopyInto(&out.Traits)
if in.Configuration != nil {
in, out := &in.Configuration, &out.Configuration
@@ -1130,13 +1081,6 @@ func (in *IntegrationSpec) DeepCopyInto(out *IntegrationSpec) {
(*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.IntegrationKit != nil {
in, out := &in.IntegrationKit, &out.IntegrationKit
*out = new(corev1.ObjectReference)
@@ -1195,13 +1139,6 @@ func (in *IntegrationStatus) DeepCopyInto(out *IntegrationStatus) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
- if in.GeneratedResources != nil {
- in, out := &in.GeneratedResources, &out.GeneratedResources
- *out = make([]ResourceSpec, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
if in.Configuration != nil {
in, out := &in.Configuration, &out.Configuration
*out = make([]ConfigurationSpec, len(*in))
@@ -1338,11 +1275,6 @@ func (in *MavenSpec) DeepCopyInto(out *MavenSpec) {
}
in.Settings.DeepCopyInto(&out.Settings)
in.SettingsSecurity.DeepCopyInto(&out.SettingsSecurity)
- if in.CASecret != nil {
- in, out := &in.CASecret, &out.CASecret
- *out = new(corev1.SecretKeySelector)
- (*in).DeepCopyInto(*out)
- }
if in.CASecrets != nil {
in, out := &in.CASecrets, &out.CASecrets
*out = make([]corev1.SecretKeySelector, len(*in))
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go b/pkg/apis/camel/v1alpha1/error_handler_types.go
index 7083839dd..0fac0564a 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -52,7 +52,4 @@ const (
ErrorHandlerTypeLog ErrorHandlerType = "log"
// ErrorHandlerTypeSink used to send the event to a further sink (for future processing). This was previously known as dead-letter-channel.
ErrorHandlerTypeSink ErrorHandlerType = "sink"
- // ErrorHandlerTypeDeadLetterChannel used to send the event to a dead letter channel
- // Deprecated in favour of ErrorHandlerTypeSink
- ErrorHandlerTypeDeadLetterChannel ErrorHandlerType = "dead-letter-channel"
)
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go b/pkg/apis/camel/v1alpha1/kamelet_types.go
index 32c96a743..fe4f3adb2 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -76,11 +76,6 @@ type KameletSpec struct {
Sources []camelv1.SourceSpec `json:"sources,omitempty"`
// the main source in YAML DSL
Template *Template `json:"template,omitempty"`
- // Deprecated: use Template instead
- // the main source in YAML DSL
- Flow *camelv1.Flow `json:"flow,omitempty"`
- // Deprecated: unused
- Authorization *AuthorizationSpec `json:"authorization,omitempty"`
// data specification types for the events consumed/produced by the Kamelet
Types map[EventSlot]EventTypeSpec `json:"types,omitempty"`
// Camel dependencies needed by the Kamelet
@@ -113,11 +108,6 @@ type EventTypeSpec struct {
Schema *JSONSchemaProps `json:"schema,omitempty"`
}
-// AuthorizationSpec is TODO (oauth information)
-// Deprecated: unused
-type AuthorizationSpec struct {
-}
-
// KameletStatus defines the observed state of Kamelet
type KameletStatus struct {
// ObservedGeneration is the most recent generation observed for this Kamelet.
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_types_support.go
index e36320420..3b91a2d1e 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types_support.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types_support.go
@@ -192,13 +192,10 @@ func ValidKameletProperties(kamelet *Kamelet) bool {
return true
}
-func ValidKameletTemplate(kamelet *Kamelet) bool {
+func ValidKamelet(kamelet *Kamelet) bool {
if kamelet == nil {
return true
}
- if kamelet.Spec.Template != nil && kamelet.Spec.Flow != nil {
- return false
- }
return true
}
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index e760a6b42..0affb7504 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -12,21 +12,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
)
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AuthorizationSpec) DeepCopyInto(out *AuthorizationSpec) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthorizationSpec.
-func (in *AuthorizationSpec) DeepCopy() *AuthorizationSpec {
- if in == nil {
- return nil
- }
- out := new(AuthorizationSpec)
- in.DeepCopyInto(out)
- return out
-}
-
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *BeanProperties) DeepCopyInto(out *BeanProperties) {
*out = *in
@@ -629,16 +614,6 @@ func (in *KameletSpec) DeepCopyInto(out *KameletSpec) {
*out = new(Template)
(*in).DeepCopyInto(*out)
}
- if in.Flow != nil {
- in, out := &in.Flow, &out.Flow
- *out = new(v1.Flow)
- (*in).DeepCopyInto(*out)
- }
- if in.Authorization != nil {
- in, out := &in.Authorization, &out.Authorization
- *out = new(AuthorizationSpec)
- **out = **in
- }
if in.Types != nil {
in, out := &in.Types, &out.Types
*out = make(map[EventSlot]EventTypeSpec, len(*in))
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index f7007dbae..f97274ebb 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -21,7 +21,6 @@ import (
"context"
"errors"
"os"
- "path"
"sort"
"strconv"
"time"
@@ -65,30 +64,6 @@ func (t *builderTask) Do(ctx context.Context) v1.BuildStatus {
BaseImage: t.task.BaseImage,
}
- // Add sources
- // nolint: staticcheck
- for _, data := range t.task.Sources {
- c.Resources = append(c.Resources, resource{
- Content: []byte(data.Content),
- Target: path.Join("sources", data.Name),
- })
- }
-
- // Add resources
- // nolint: staticcheck
- for _, data := range t.task.Resources {
- t := path.Join("resources", data.Name)
-
- if data.MountPath != "" {
- t = path.Join(data.MountPath, data.Name)
- }
-
- c.Resources = append(c.Resources, resource{
- Content: []byte(data.Content),
- Target: t,
- })
- }
-
steps, err := StepsFrom(t.task.Steps...)
if err != nil {
t.log.Errorf(err, "invalid builder steps: %s", t.task.Steps)
diff --git a/pkg/builder/project.go b/pkg/builder/project.go
index 28878c8d1..66071522e 100644
--- a/pkg/builder/project.go
+++ b/pkg/builder/project.go
@@ -78,8 +78,7 @@ func cleanUpBuildDir(ctx *builderContext) error {
}
func generateJavaKeystore(ctx *builderContext) error {
- // nolint: staticcheck
- secrets := mergeSecrets(ctx.Build.Maven.CASecrets, ctx.Build.Maven.CASecret)
+ secrets := ctx.Build.Maven.CASecrets
if secrets == nil {
return nil
}
diff --git a/pkg/cmd/describe_integration.go b/pkg/cmd/describe_integration.go
index 5930a7146..70a7403c5 100644
--- a/pkg/cmd/describe_integration.go
+++ b/pkg/cmd/describe_integration.go
@@ -135,16 +135,6 @@ func (command *describeIntegrationCommandOptions) describeIntegration(cmd *cobra
}
}
- if len(i.Spec.Resources) > 0 {
- w.Writef(0, "Resources:\n")
- for _, resource := range i.Spec.Resources {
- w.Writef(1, "Content:\n")
- w.Writef(2, "%s\n", strings.TrimSpace(resource.Content))
- w.Writef(1, "Name:\t%s\n", resource.Name)
- w.Writef(1, "Type:\t%s\n", resource.Type)
- }
- }
-
if len(i.Sources()) > 0 {
w.Writef(0, "Sources:\n")
if command.showSourceContent {
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index 8d2969df7..070ae1038 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -424,7 +424,6 @@ func TestConfigureTraits(t *testing.T) {
runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
_, err := test.ExecuteCommand(rootCmd, "run",
"--trait", "affinity.pod-affinity=false",
- "--trait", "container.probes-enabled=false",
"--trait", "environment.container-meta=false",
"--trait", "jvm.print-command=false",
"--trait", "prometheus.pod-monitor=false",
@@ -444,9 +443,8 @@ func TestConfigureTraits(t *testing.T) {
assert.Nil(t, err)
traitMap, err := trait.ToTraitMap(traits)
assert.Nil(t, err)
- assert.Len(t, traitMap, 5)
+ assert.Len(t, traitMap, 4)
assertTraitConfiguration(t, traits.Affinity, &traitv1.AffinityTrait{PodAffinity: pointer.Bool(false)})
- assertTraitConfiguration(t, traits.Container, &traitv1.ContainerTrait{DeprecatedProbesEnabled: pointer.Bool(false)})
assertTraitConfiguration(t, traits.Environment, &traitv1.EnvironmentTrait{ContainerMeta: pointer.Bool(false)})
assertTraitConfiguration(t, traits.JVM, &traitv1.JVMTrait{PrintCommand: pointer.Bool(false)})
assertTraitConfiguration(t, traits.Prometheus, &traitv1.PrometheusTrait{PodMonitor: pointer.Bool(false)})
diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go
index 4b1e2168e..9fc708adb 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -72,9 +72,6 @@ func (action *initializeAction) Handle(ctx context.Context, platform *v1.Integra
// nolint: staticcheck
if platform.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko {
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")
@@ -125,12 +122,7 @@ 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
- }
-
+ pvcName := platform.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]
pvc := &corev1.PersistentVolumeClaim{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
diff --git a/pkg/controller/integrationplatform/kaniko_cache.go b/pkg/controller/integrationplatform/kaniko_cache.go
index 4ac5e773d..b62b0843f 100644
--- a/pkg/controller/integrationplatform/kaniko_cache.go
+++ b/pkg/controller/integrationplatform/kaniko_cache.go
@@ -40,11 +40,7 @@ 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
- }
+ pvcName := platform.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]
var warmerImage string
if image, found := platform.Status.Build.PublishStrategyOptions[builder.KanikoWarmerImage]; found {
diff --git a/pkg/controller/kameletbinding/error_handler.go b/pkg/controller/kameletbinding/error_handler.go
index f7dc600f4..470d3dca5 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -73,9 +73,6 @@ func parseErrorHandler(rawMessage v1alpha1.RawMessage) (v1alpha1.ErrorHandler, e
dst = new(v1alpha1.ErrorHandlerNone)
case v1alpha1.ErrorHandlerTypeLog:
dst = new(v1alpha1.ErrorHandlerLog)
- // Deprecated: left for compatibility for some version
- case v1alpha1.ErrorHandlerTypeDeadLetterChannel:
- dst = new(v1alpha1.ErrorHandlerSink)
case v1alpha1.ErrorHandlerTypeSink:
dst = new(v1alpha1.ErrorHandlerSink)
default:
diff --git a/pkg/kamelet/initialize.go b/pkg/kamelet/initialize.go
index 0ac666a8c..3d9ce8c23 100644
--- a/pkg/kamelet/initialize.go
+++ b/pkg/kamelet/initialize.go
@@ -50,7 +50,7 @@ func Initialize(kamelet *v1alpha1.Kamelet) (*v1alpha1.Kamelet, error) {
fmt.Sprintf("Kamelet property %q is reserved and cannot be part of the schema", v1alpha1.KameletIDProperty),
)
}
- if !v1alpha1.ValidKameletTemplate(kamelet) {
+ if !v1alpha1.ValidKamelet(kamelet) {
ok = false
target.Status.SetCondition(
v1alpha1.KameletConditionReady,
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index c20aacc5a..081411b69 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -117,51 +117,51 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_builds.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
modTime: time.Time{},
- uncompressedSize: 43674,
+ uncompressedSize: 35823,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3d\x5d\x73\x23\x39\x6e\xef\xfe\x15\xa8\xf5\xc3\x78\xaa\x2c\x69\x77\xef\x23\x1b\xa7\x52\x29\x9f\x67\x77\xcf\x99\x0f\x3b\x23\xef\xdc\xdd\x9b\xa9\x6e\x48\xe2\xaa\x9b\xec\x90\x6c\x6b\x74\xa9\xfc\xf7\x14\x41\xb2\xd5\x92\xfa\x83\xed\x8f\x99\xcb\xad\xf8\x32\xe3\x16\x09\x82\x20\x08\x80\x20\x08\x9e\xc2\xe8\xf9\xca\xc9\x29\xbc\xe3\x09\x0a\x8d\x29\x18\x09\x66\x89\x70\x59\xb0\x64\x89\x30\x95\x73\xb3\x66\x0a\xe1\x27\x59\x8a\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3d\x5d\x93\xdb\x36\x92\xef\xfa\x15\x5d\x99\x07\x8f\xab\xf4\x91\xaf\xcd\xe5\xe6\xea\xea\x4a\x3b\x8e\xb3\x73\x8e\x3d\x3e\x6b\xe2\x24\x6f\x03\x91\x2d\x09\x11\x09\xf0\x00\x70\x64\xed\xd5\xfd\xf7\x2b\x34\x40\x8a\x92\xf8\x01\xce\x68\xe2\xbd\x8d\xf0\x62\x0f\x05\x36\x1a\xfd\x8d\x46\x13\xb8\x80\xd1\xe9\xda\xe0\x02\x7e\xe2\x11\x0a\x8d\x31\x18\x09\x66\x85\x30\xcd\x58\xb4\x42\x98\xc9\x85\xd9\x30\x85\xf0\x5a\xe6\x22\x66\x86\x [...]
},
"/crd/bases/camel.apache.org_camelcatalogs.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_camelcatalogs.yaml",
modTime: time.Time{},
- uncompressedSize: 18201,
+ uncompressedSize: 17698,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x4f\x73\xdb\xb8\x15\xbf\xf3\x53\xbc\x89\x0e\x49\x66\x24\x6a\xd3\xce\x74\x3a\xea\xc9\xb5\x9d\x5d\x35\x5e\x3b\xb5\x94\xec\xec\x11\x22\x9f\x28\xc4\x24\xc0\x02\xa0\x64\x6d\xa7\xdf\xbd\x03\x80\x14\x49\x89\x7f\x40\xd9\x9e\xec\xce\x1a\x27\x8b\x00\x1e\x7e\x78\xff\x1f\x08\x7a\x04\x93\xe7\x6b\xde\x08\x6e\x68\x80\x4c\x62\x08\x8a\x83\xda\x20\x5c\xa4\x24\xd8\x20\x2c\xf8\x5a\xed\x88\x40\xf8\xc8\x33\x16\x12\x45\x39\x83\x77\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x4f\x73\xdb\xb8\x15\xbf\xf3\x53\xbc\x89\x0e\x49\x66\x24\x6a\xd3\xce\x74\x3a\xea\xc9\xb5\x9d\x5d\x35\x5e\x3b\xb5\x94\xec\xec\x11\x22\x9f\x28\xc4\x24\xc0\x02\xa0\x64\x6d\xa7\xdf\xbd\x03\x80\x14\x49\x89\x7f\x40\xd9\x9e\xec\xce\x1a\x27\x8b\x00\x1e\x7e\x78\xff\x1f\x48\x78\x04\x93\xe7\x6b\xde\x08\x6e\x68\x80\x4c\x62\x08\x8a\x83\xda\x20\x5c\xa4\x24\xd8\x20\x2c\xf8\x5a\xed\x88\x40\xf8\xc8\x33\x16\x12\x45\x39\x83\x77\x [...]
},
"/crd/bases/camel.apache.org_integrationkits.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrationkits.yaml",
modTime: time.Time{},
- uncompressedSize: 16400,
+ uncompressedSize: 16165,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3b\x5d\x73\xdb\x48\x72\xef\xfc\x15\x5d\xab\x07\xdb\x55\x24\x74\x9b\x5c\x5d\xa5\x94\xca\x83\x4e\xb6\xf7\x54\xb6\x25\xc5\xe2\xee\x65\xab\xfc\xa0\x26\xd0\x24\x67\x09\xcc\xe0\x66\x06\xa4\x98\x54\xfe\x7b\xaa\x7b\x06\x20\x48\x02\x20\x57\x5e\xe7\x5e\x8c\x17\x5b\xc0\x4c\x4f\x7f\x7f\x4c\x37\x2f\x60\xf2\xc7\x3d\xa3\x0b\xf8\xa8\x52\xd2\x8e\x32\xf0\x06\xfc\x92\xe0\xba\xc4\x74\x49\xf0\x68\xe6\x7e\x83\x96\xe0\xbd\xa9\x74\x86\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x4f\x73\xdb\xb8\x92\xbf\xeb\x53\x74\x8d\x0f\x49\xaa\x24\xfa\xcd\xee\xab\x57\x5b\xde\xda\x83\x9f\x27\x99\xe7\x4a\xe2\x64\x63\x67\xde\x4e\x55\x0e\x6e\x91\x2d\x0a\x23\x12\xe0\x00\xa0\x64\xed\xd6\x7e\xf7\xad\x6e\x80\x14\x25\x91\x94\xc6\x99\xec\x29\xbc\x24\x26\x81\x46\xff\xfd\x75\x37\x00\x5d\xc0\xec\xcf\x7b\x26\x17\xf0\x4e\xa5\xa4\x1d\x65\xe0\x0d\xf8\x25\xc1\x75\x85\xe9\x92\xe0\xde\x2c\xfc\x06\x2d\xc1\x1b\x53\xeb\x [...]
},
"/crd/bases/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrationplatforms.yaml",
modTime: time.Time{},
- uncompressedSize: 181363,
+ uncompressedSize: 168233,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\xdb\x36\xb6\x30\xfe\x7f\x3e\x05\xc6\x9d\x3b\x76\x32\x92\x9c\xec\xde\xee\xf6\xfa\x4e\xe7\x79\x5c\x27\x6d\xdd\xc4\xb1\xaf\xed\x64\xef\x4e\xdb\xa9\x20\xf2\x48\x42\x4c\x02\x5c\x00\x94\xad\xfe\xf6\xf7\xdd\x9f\xc1\x01\x40\x52\x12\x09\x52\x92\x5f\xd2\x46\xec\xcc\x6e\x6c\x13\xe0\xc1\xc1\xc1\x79\xc3\x79\xf9\x8a\xf4\xef\xef\x79\xf6\x15\x79\xc7\x22\xe0\x0a\x62\xa2\x05\xd1\x53\x20\xc7\x19\x8d\xa6\x40\xae\xc4\x58\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\xfd\x73\xdb\x36\xb6\x30\x8e\xff\x9e\xbf\x02\xe3\xce\x9d\x38\x19\x4b\x4e\xba\xb7\xbb\xbd\x7e\xa6\xf3\x3c\xae\x93\xb6\x6e\xde\x7c\x6d\x27\x7b\x77\xda\x4e\x05\x91\x47\x12\x6a\x10\xe0\x05\x40\xd9\xea\x77\xbf\xff\xfb\x67\x70\x00\x90\x94\x44\x82\x94\xe4\xc4\x69\x2b\x76\x66\x37\xb6\x89\xc3\x03\xe0\xe0\xbc\xe1\xbc\x7c\x41\x06\xf7\xf7\x3c\xfa\x82\xbc\x66\x09\x08\x0d\x29\x31\x92\x98\x19\x90\xd3\x9c\x26\x33\x20\x57\x72\x [...]
},
"/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrations.yaml",
modTime: time.Time{},
- uncompressedSize: 489047,
+ uncompressedSize: 479896,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x38\x0c\xff\xef\x4f\x81\x72\x52\x3f\x49\x1b\x91\xb2\x33\xb3\x53\x3b\x7e\xa7\x36\xa5\x91\xe4\x44\x6f\x6c\x99\x65\x29\xc9\x2f\xe5\x64\x13\xb0\x1b\x24\xb1\x6a\x02\x3d\x00\x9a\x12\xe7\xc9\xf3\xdd\x9f\xc2\x01\xd0\x17\xde\xfa\xa0\x45\x3a\xce\x4c\x63\xaa\x32\x26\xc5\x3e\x8d\xcb\xc1\xb9\x5f\x3e\x23\x83\xfd\x8d\x67\x9f\x91\x37\x3c\x61\x42\xb3\x94\x18\x49\xcc\x8c\x91\xf3\x9c\x26\x33\x46\x6e\xe5\xc4\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\xb6\x28\x8a\xff\xef\x4f\x81\x72\x52\x47\xd2\x8e\x48\xd9\x99\x39\xa9\x3d\xfe\x4d\x9d\x94\x46\x92\x13\xfd\x62\xcb\x2c\x4b\x49\x4e\xca\xc9\x4e\xc0\x6e\x90\xc4\x56\x13\xe8\x01\xd0\x94\x38\x37\xf7\xbb\xdf\xc2\x02\xd0\x0f\xbe\x7a\xa1\x45\x3a\xce\x9e\xc6\x54\x65\x4c\x91\xbd\x1a\x8f\x85\xf5\x7e\x7c\x46\x06\xfb\x1b\xcf\x3e\x23\x6f\x78\xc2\x84\x66\x29\x31\x92\x98\x19\x23\xe7\x39\x4d\x66\x8c\xdc\xca\x89\x [...]
},
"/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 563105,
+ uncompressedSize: 555683,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\xb6\x28\x8a\xff\x9f\x4f\x81\x72\x52\x47\xd2\x8e\x48\xd9\x99\x47\xed\xf1\x6f\xea\xa4\xb4\x65\x39\xd1\x2f\xb1\xcc\xb2\x94\xe4\xa4\x9c\xec\x04\xec\x06\x49\x1c\x35\x81\xde\x00\x9a\x12\xe7\xe6\x7e\xf7\x5b\x58\x00\xba\xd1\x7c\x09\xab\x29\x69\xe4\x99\xc6\x54\x65\x4c\x8a\xbd\x1a\x8f\x85\xf5\x7e\x7c\x4e\x06\x0f\x37\x3e\xfb\x9c\x7c\xcf\x33\x26\x34\xcb\x89\x91\xc4\xcc\x18\x39\x2d\x69\x36\x63\xe4\x4a\x4e\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x23\xb7\xb5\x28\x8a\xff\xef\x4f\x81\x1a\xbb\x8e\xa4\x6d\x91\x9a\x71\xb2\x53\x3b\xf3\x4b\x1d\x97\xa2\xd1\xd8\xfa\x79\x46\xc3\x1a\xc9\xce\x71\x8d\xbd\x1d\xb0\x1b\x24\x71\xd4\x04\x7a\x03\x68\x4a\xcc\xf5\xfd\xee\xb7\xb0\x00\x74\xa3\xf9\x12\x56\x53\x52\x34\x49\x23\x55\xce\x90\x62\xaf\xc6\x6b\xbd\x5f\x5f\x92\xc1\xc3\x8d\x2f\xbe\x24\xef\x78\xc6\x84\x66\x39\x31\x92\x98\x19\x23\xa7\x25\xcd\x66\x8c\x5c\xc9\x89\x [...]
},
"/crd/bases/camel.apache.org_kamelets.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 25922,
+ uncompressedSize: 25596,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7c\x6f\x53\xe3\x38\xb6\xf7\xfb\x7c\x8a\x53\x30\x55\x4d\x57\xe1\x90\x10\x60\xba\xf3\xbc\xe8\x62\xa0\x7b\x36\xcf\x30\x40\x11\xd8\xbd\x73\xa1\xb7\x4a\xb1\x4f\x12\x0d\xb6\xe4\x95\x64\x42\x76\xe0\xbb\xdf\x92\x64\x3b\x0e\x89\x6d\x25\x04\xb6\xeb\xd6\x55\x55\x57\xe3\x58\x3a\x3a\xff\x74\x74\x24\xfd\xe4\x6d\xf0\x36\x57\x1a\xdb\x70\x46\x7d\x64\x12\x03\x50\x1c\xd4\x18\xe1\x38\x26\xfe\x18\xa1\xcf\x87\x6a\x42\x04\xc2\x37\x9e\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\xff\x4f\xe3\xb8\xb6\xff\xbd\x7f\xc5\x11\xac\x34\x8c\x44\x4a\x4b\x81\x9d\xe9\xfb\x61\xc4\xc2\xcc\xde\xbe\x9d\x05\x44\xe1\xde\xb7\x0f\xe6\x4a\x6e\x72\xda\x7a\x49\xec\x5c\xdb\x81\xf6\x2d\xfc\xef\x4f\xb6\x93\x34\xfd\x92\xc4\x2d\x65\xee\xe8\xe9\x59\x1a\x0d\x69\xec\xe3\xf3\xcd\xc7\xc7\xf6\xc7\xd9\x05\x6f\x7b\xa5\xb1\x0b\x5f\xa9\x8f\x4c\x62\x00\x8a\x83\x1a\x23\x9c\xc6\xc4\x1f\x23\xf4\xf9\x50\x3d\x11\x81\xf0\x85\x27\x [...]
},
"/manager": &vfsgen۰DirInfo{
name: "manager",
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 912b8942d..a02ac2eda 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -123,16 +123,8 @@ func (t *builderTrait) Apply(e *Environment) error {
}})
//nolint: staticcheck,nolintlint
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
- }
+ persistentVolumeClaim := e.Platform.Status.Build.PublishStrategyOptions[builder.KanikoPVCName]
+ cacheEnabled := e.Platform.Status.Build.IsOptionEnabled(builder.KanikoBuildCacheEnabled)
var executorImage string
if image, found := e.Platform.Status.Build.PublishStrategyOptions[builder.KanikoExecutorImage]; found {
diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go
index c444d4d54..41ab8ab5a 100644
--- a/pkg/trait/builder_test.go
+++ b/pkg/trait/builder_test.go
@@ -107,7 +107,6 @@ func createBuilderTestEnv(cluster v1.IntegrationPlatformCluster, strategy v1.Int
panic(err)
}
- kanikoCache := false
res := &Environment{
Ctx: context.TODO(),
CamelCatalog: c,
@@ -135,7 +134,6 @@ func createBuilderTestEnv(cluster v1.IntegrationPlatformCluster, strategy v1.Int
RuntimeVersion: defaults.DefaultRuntimeVersion,
RuntimeProvider: v1.RuntimeProviderQuarkus,
PublishStrategyOptions: map[string]string{},
- KanikoBuildCache: &kanikoCache,
},
},
Status: v1.IntegrationPlatformStatus{
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index 4b889f381..09992ae4e 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -236,54 +236,6 @@ func (t *camelTrait) computeConfigMaps(e *Environment) []ctrl.Object {
maps = append(maps, &cm)
}
- for i, r := range e.Integration.Spec.Resources {
- if r.Type == v1.ResourceTypeOpenAPI {
- continue
- }
- if r.ContentRef != "" {
- continue
- }
-
- cmKey := "content"
- if r.ContentKey != "" {
- cmKey = r.ContentKey
- }
-
- cm := corev1.ConfigMap{
- TypeMeta: metav1.TypeMeta{
- Kind: "ConfigMap",
- APIVersion: "v1",
- },
- ObjectMeta: metav1.ObjectMeta{
- Name: fmt.Sprintf("%s-resource-%03d", e.Integration.Name, i),
- Namespace: e.Integration.Namespace,
- Labels: map[string]string{
- "camel.apache.org/integration": e.Integration.Name,
- },
- Annotations: map[string]string{
- "camel.apache.org/resource.name": r.Name,
- "camel.apache.org/resource.compression": strconv.FormatBool(r.Compression),
- },
- },
- }
-
- if r.ContentType != "" {
- cm.Annotations["camel.apache.org/resource.content-type"] = r.ContentType
- }
-
- if r.RawContent != nil {
- cm.BinaryData = map[string][]byte{
- cmKey: r.RawContent,
- }
- } else {
- cm.Data = map[string]string{
- cmKey: r.Content,
- }
- }
-
- maps = append(maps, &cm)
- }
-
return maps
}
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index 426d63efb..bf2205473 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -57,13 +57,10 @@ func newContainerTrait() Trait {
return &containerTrait{
BaseTrait: NewBaseTrait(containerTraitID, 1600),
ContainerTrait: traitv1.ContainerTrait{
- Port: defaultContainerPort,
- ServicePort: defaultServicePort,
- ServicePortName: defaultContainerPortName,
- Name: defaultContainerName,
- DeprecatedProbesEnabled: pointer.Bool(false),
- DeprecatedLivenessScheme: string(corev1.URISchemeHTTP),
- DeprecatedReadinessScheme: string(corev1.URISchemeHTTP),
+ Port: defaultContainerPort,
+ ServicePort: defaultServicePort,
+ ServicePortName: defaultContainerPortName,
+ Name: defaultContainerName,
},
}
}
diff --git a/pkg/trait/container_probes_test.go b/pkg/trait/container_probes_test.go
index 55c1c6287..2a8355ebe 100644
--- a/pkg/trait/container_probes_test.go
+++ b/pkg/trait/container_probes_test.go
@@ -63,9 +63,7 @@ func TestProbesDependencies(t *testing.T) {
integration := &v1.Integration{
Spec: v1.IntegrationSpec{
Traits: v1.Traits{
- Container: &traitv1.ContainerTrait{
- DeprecatedProbesEnabled: pointer.Bool(true),
- },
+ Health: &traitv1.HealthTrait{},
},
},
}
@@ -83,10 +81,10 @@ func TestProbesOnDeployment(t *testing.T) {
integration := &v1.Integration{
Spec: v1.IntegrationSpec{
Traits: v1.Traits{
- Container: &traitv1.ContainerTrait{
- DeprecatedProbesEnabled: pointer.Bool(true),
- Expose: pointer.Bool(true),
- DeprecatedLivenessTimeout: 1234,
+ Health: &traitv1.HealthTrait{
+ LivenessProbeEnabled: pointer.Bool(true),
+ ReadinessProbeEnabled: pointer.Bool(true),
+ LivenessTimeout: 1234,
},
},
},
@@ -115,12 +113,12 @@ func TestProbesOnDeploymentWithCustomScheme(t *testing.T) {
integration := &v1.Integration{
Spec: v1.IntegrationSpec{
Traits: v1.Traits{
- Container: &traitv1.ContainerTrait{
- DeprecatedProbesEnabled: pointer.Bool(true),
- Expose: pointer.Bool(true),
- DeprecatedLivenessTimeout: 1234,
- DeprecatedLivenessScheme: "HTTPS",
- DeprecatedReadinessScheme: "HTTPS",
+ Health: &traitv1.HealthTrait{
+ LivenessProbeEnabled: pointer.Bool(true),
+ ReadinessProbeEnabled: pointer.Bool(true),
+ LivenessScheme: "HTTPS",
+ ReadinessScheme: "HTTPS",
+ LivenessTimeout: 1234,
},
},
},
@@ -155,10 +153,10 @@ func TestProbesOnKnativeService(t *testing.T) {
Enabled: pointer.Bool(true),
},
},
- Container: &traitv1.ContainerTrait{
- DeprecatedProbesEnabled: pointer.Bool(true),
- Expose: pointer.Bool(true),
- DeprecatedLivenessTimeout: 1234,
+ Health: &traitv1.HealthTrait{
+ LivenessProbeEnabled: pointer.Bool(true),
+ ReadinessProbeEnabled: pointer.Bool(true),
+ LivenessTimeout: 1234,
},
},
},
diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go
index 46dbc8980..404b0c80e 100644
--- a/pkg/trait/cron_test.go
+++ b/pkg/trait/cron_test.go
@@ -249,8 +249,7 @@ func TestCronDeps(t *testing.T) {
Language: v1.LanguageJavaSource,
},
},
- Resources: []v1.ResourceSpec{},
- Traits: v1.Traits{},
+ Traits: v1.Traits{},
},
},
IntegrationKit: &v1.IntegrationKit{
@@ -323,7 +322,6 @@ func TestCronDepsFallback(t *testing.T) {
Language: v1.LanguageJavaSource,
},
},
- Resources: []v1.ResourceSpec{},
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
Fallback: pointer.Bool(true),
@@ -402,7 +400,6 @@ func TestCronWithActiveDeadline(t *testing.T) {
Language: v1.LanguageJavaSource,
},
},
- Resources: []v1.ResourceSpec{},
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
ActiveDeadlineSeconds: pointer.Int64(120),
@@ -484,7 +481,6 @@ func TestCronWithBackoffLimit(t *testing.T) {
Language: v1.LanguageJavaSource,
},
},
- Resources: []v1.ResourceSpec{},
Traits: v1.Traits{
Cron: &traitv1.CronTrait{
BackoffLimit: pointer.Int32(5),
diff --git a/pkg/trait/health.go b/pkg/trait/health.go
index 33c81f3fd..ba06fb10c 100644
--- a/pkg/trait/health.go
+++ b/pkg/trait/health.go
@@ -18,7 +18,6 @@ limitations under the License.
package trait
import (
- "encoding/json"
"sort"
corev1 "k8s.io/api/core/v1"
@@ -56,29 +55,6 @@ func (t *healthTrait) Configure(e *Environment) (bool, error) {
return false, nil
}
- if !pointer.BoolDeref(t.Enabled, false) {
- // Source the configuration from the container trait to maintain backward compatibility.
- // This can be removed once the deprecated properties related to health probes are actually
- // removed from the container trait.
- if trait := e.Catalog.GetTrait(containerTraitID); trait != nil {
- if container, ok := trait.(*containerTrait); ok && pointer.BoolDeref(container.Enabled, true) && pointer.BoolDeref(container.DeprecatedProbesEnabled, false) {
- config, err := json.Marshal(container)
- if err != nil {
- return false, err
- }
- err = json.Unmarshal(config, t)
- if err != nil {
- return false, err
- }
- t.Enabled = pointer.Bool(true)
- t.LivenessProbeEnabled = pointer.Bool(true)
- t.ReadinessProbeEnabled = pointer.Bool(true)
- return true, err
- }
- }
- return false, nil
- }
-
return true, nil
}
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index d7bafcc56..8f93935af 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -234,17 +234,8 @@ func (t *kameletsTrait) configureApplicationProperties(e *Environment) error {
func (t *kameletsTrait) addKameletAsSource(e *Environment, kamelet *v1alpha1.Kamelet) error {
sources := make([]v1.SourceSpec, 0)
- // nolint: staticcheck
- if kamelet.Spec.Template != nil || kamelet.Spec.Flow != nil {
+ if kamelet.Spec.Template != nil {
template := kamelet.Spec.Template
- if template == nil {
- // Backward compatibility with Kamelets using flow
- var bytes []byte = kamelet.Spec.Flow.RawMessage
- template = &v1alpha1.Template{
- RawMessage: make(v1alpha1.RawMessage, len(bytes)),
- }
- copy(template.RawMessage, bytes)
- }
flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
if err != nil {
return err
diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go
index 4719beaa2..d2f42e0aa 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -75,16 +75,6 @@ func TestKnativeService(t *testing.T) {
Language: v1.LanguageJavaScript,
},
},
- Resources: []v1.ResourceSpec{
- {
- DataSpec: v1.DataSpec{
- Name: "my-resource.txt",
- Content: "",
- Compression: false,
- },
- Type: v1.ResourceTypeData,
- },
- },
Configuration: []v1.ConfigurationSpec{
{Type: "configmap", Value: "my-cm"},
{Type: "secret", Value: "my-secret"},
@@ -129,7 +119,7 @@ func TestKnativeService(t *testing.T) {
assert.NotEmpty(t, environment.ExecutedTraits)
assert.NotNil(t, environment.GetTrait("knative"))
assert.NotNil(t, envvar.Get(environment.EnvVars, "CAMEL_KNATIVE_CONFIGURATION"))
- assert.Equal(t, 5, environment.Resources.Size())
+ assert.Equal(t, 4, environment.Resources.Size())
s := environment.Resources.GetKnativeService(func(service *serving.Service) bool {
return service.Name == KnativeServiceTestName
@@ -139,8 +129,8 @@ func TestKnativeService(t *testing.T) {
spec := s.Spec.ConfigurationSpec.Template.Spec
- assert.Len(t, spec.Containers[0].VolumeMounts, 6)
- assert.Len(t, spec.Volumes, 6)
+ assert.Len(t, spec.Containers[0].VolumeMounts, 5)
+ assert.Len(t, spec.Volumes, 5)
assert.Condition(t, func() bool {
for _, v := range spec.Containers[0].VolumeMounts {
@@ -174,7 +164,6 @@ func TestKnativeService(t *testing.T) {
assert.Contains(t, names, "test-user-properties")
assert.Contains(t, names, "test-source-000")
- assert.Contains(t, names, "test-resource-000")
environment.Resources.VisitConfigMap(func(cm *corev1.ConfigMap) {
if cm.Name == "test-properties" {
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index 63f94af82..81a168912 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -61,9 +61,8 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
Phase: v1.IntegrationPhaseDeploying,
},
Spec: v1.IntegrationSpec{
- Profile: v1.TraitProfileKnative,
- Sources: []v1.SourceSpec{},
- Resources: []v1.ResourceSpec{},
+ Profile: v1.TraitProfileKnative,
+ Sources: []v1.SourceSpec{},
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
@@ -191,7 +190,6 @@ func TestKnativeEnvConfigurationFromSource(t *testing.T) {
Language: v1.LanguageJavaSource,
},
},
- Resources: []v1.ResourceSpec{},
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
@@ -378,7 +376,6 @@ func NewFakeEnvironment(t *testing.T, source v1.SourceSpec) Environment {
Sources: []v1.SourceSpec{
source,
},
- Resources: []v1.ResourceSpec{},
Traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
Trait: traitv1.Trait{
diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go
index 813bf5205..15b3b061b 100644
--- a/pkg/trait/openapi.go
+++ b/pkg/trait/openapi.go
@@ -74,12 +74,6 @@ func (t *openAPITrait) Configure(e *Environment) (bool, error) {
return false, fmt.Errorf("the runtime provider %s does not declare 'rest' capability", e.CamelCatalog.Runtime.Provider)
}
- for _, resource := range e.Integration.Spec.Resources {
- if resource.Type == v1.ResourceTypeOpenAPI {
- return e.IntegrationInPhase(v1.IntegrationPhaseInitialization), nil
- }
- }
-
if t.Configmaps != nil {
return e.IntegrationInPhase(v1.IntegrationPhaseInitialization), nil
}
@@ -97,37 +91,15 @@ func (t *openAPITrait) Apply(e *Environment) error {
}
defer os.RemoveAll(tmpDir)
- generatedFromResources, err := t.generateFromResources(e, tmpDir)
- if err != nil {
- return err
- }
generatedFromConfigmaps, err := t.generateFromConfigmaps(e, tmpDir)
if err != nil {
return err
}
- if len(generatedFromConfigmaps) > 0 {
- generatedFromResources = append(generatedFromResources, generatedFromConfigmaps...)
- }
- e.Integration.Status.GeneratedSources = generatedFromResources
+ e.Integration.Status.GeneratedSources = generatedFromConfigmaps
return nil
}
-func (t *openAPITrait) generateFromResources(e *Environment, tmpDir string) ([]v1.SourceSpec, error) {
- dataSpecs := make([]v1.DataSpec, 0, len(e.Integration.Spec.Resources))
- for _, resource := range e.Integration.Spec.Resources {
- if resource.Type != v1.ResourceTypeOpenAPI {
- continue
- }
- if resource.Name == "" {
- return nil, fmt.Errorf("no name defined for the openapi resource: %v", resource)
- }
- dataSpecs = append(dataSpecs, resource.DataSpec)
- }
-
- return t.generateFromDataSpecs(e, tmpDir, dataSpecs)
-}
-
func (t *openAPITrait) generateFromConfigmaps(e *Environment, tmpDir string) ([]v1.SourceSpec, error) {
dataSpecs := make([]v1.DataSpec, 0, len(t.Configmaps))
for _, configmap := range t.Configmaps {
@@ -270,8 +242,7 @@ func (t *openAPITrait) createNewOpenAPIConfigMap(e *Environment, resource v1.Dat
return err
}
mc.GlobalSettings = data
- //nolint: staticcheck,nolintlint
- secrets := mergeSecrets(e.Platform.Status.Build.Maven.CASecrets, e.Platform.Status.Build.Maven.CASecret)
+ secrets := e.Platform.Status.Build.Maven.CASecrets
if secrets != nil {
certsData, err := kubernetes.GetSecretsRefData(e.Ctx, e.Client, e.Platform.Namespace, secrets)
diff --git a/pkg/trait/openapi_test.go b/pkg/trait/openapi_test.go
index dc09c01dc..24e788966 100644
--- a/pkg/trait/openapi_test.go
+++ b/pkg/trait/openapi_test.go
@@ -35,7 +35,7 @@ func TestRestDslTraitApplicability(t *testing.T) {
CamelCatalog: catalog,
}
- trait := newOpenAPITrait()
+ trait, _ := newOpenAPITrait().(*openAPITrait)
enabled, err := trait.Configure(e)
assert.Nil(t, err)
assert.False(t, enabled)
@@ -49,10 +49,8 @@ func TestRestDslTraitApplicability(t *testing.T) {
assert.Nil(t, err)
assert.False(t, enabled)
- resource := v1.ResourceSpec{
- Type: v1.ResourceTypeOpenAPI,
- }
- e.Integration.Spec.Resources = append(e.Integration.Spec.Resources, resource)
+ trait.Configmaps = []string{"my-configmap"}
+
enabled, err = trait.Configure(e)
assert.Nil(t, err)
assert.False(t, enabled)
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 2ff2420bc..114c6fe00 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -191,51 +191,18 @@ func TestConfigureVolumesAndMountsTextResourcesAndProperties(t *testing.T) {
Namespace: "ns",
},
Spec: v1.IntegrationSpec{
- Resources: []v1.ResourceSpec{
- {
- DataSpec: v1.DataSpec{
- Name: "res1.txt",
- ContentRef: "my-cm1",
- ContentKey: "my-key1",
- },
- Type: "data",
- MountPath: "/etc/m1",
- },
- {
- DataSpec: v1.DataSpec{
- Name: "res2.txt",
- ContentRef: "my-cm2",
- },
- Type: "data",
- },
- {
- DataSpec: v1.DataSpec{
- Name: "res3.txt",
- ContentKey: "my-key3",
- },
- Type: "data",
- },
- {
- DataSpec: v1.DataSpec{
- Name: "res4.txt",
- },
- Type: "data",
- },
- },
Configuration: []v1.ConfigurationSpec{
{
Type: "property",
Value: "a=b",
},
{
- Type: "configmap",
- Value: "test-configmap",
- ResourceType: "config",
+ Type: "configmap",
+ Value: "test-configmap",
},
{
- Type: "secret",
- Value: "test-secret",
- ResourceType: "config",
+ Type: "secret",
+ Value: "test-secret",
},
{
Type: "volume",
@@ -255,60 +222,16 @@ func TestConfigureVolumesAndMountsTextResourcesAndProperties(t *testing.T) {
env.configureVolumesAndMounts(&vols, &mnts)
- assert.Len(t, vols, 7)
- assert.Len(t, mnts, 7)
-
- v := findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == "my-cm1" })
- assert.NotNil(t, v)
- assert.NotNil(t, v.VolumeSource.ConfigMap)
- assert.Len(t, v.VolumeSource.ConfigMap.Items, 1)
- assert.Equal(t, "my-key1", v.VolumeSource.ConfigMap.Items[0].Key)
- assert.Equal(t, "res1.txt", v.VolumeSource.ConfigMap.Items[0].Path)
-
- m := findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == "i-resource-000" })
- assert.NotNil(t, m)
- assert.Equal(t, "/etc/m1", m.MountPath)
-
- v = findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == "my-cm2" })
- assert.NotNil(t, v)
- assert.NotNil(t, v.VolumeSource.ConfigMap)
- assert.Len(t, v.VolumeSource.ConfigMap.Items, 1)
- assert.Equal(t, "content", v.VolumeSource.ConfigMap.Items[0].Key)
- assert.Equal(t, "res2.txt", v.VolumeSource.ConfigMap.Items[0].Path)
-
- m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == "i-resource-001" })
- assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/resources/res2.txt", m.MountPath)
-
- v = findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == TestDeploymentName+"-resource-002" })
- assert.NotNil(t, v)
- assert.NotNil(t, v.VolumeSource.ConfigMap)
- assert.Len(t, v.VolumeSource.ConfigMap.Items, 1)
- assert.Equal(t, "my-key3", v.VolumeSource.ConfigMap.Items[0].Key)
- assert.Equal(t, "res3.txt", v.VolumeSource.ConfigMap.Items[0].Path)
-
- m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == "i-resource-002" })
- assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/resources/res3.txt", m.MountPath)
-
- v = findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == TestDeploymentName+"-resource-003" })
- assert.NotNil(t, v)
- assert.NotNil(t, v.VolumeSource.ConfigMap)
- assert.Len(t, v.VolumeSource.ConfigMap.Items, 1)
- assert.Equal(t, "content", v.VolumeSource.ConfigMap.Items[0].Key)
- assert.Equal(t, "res4.txt", v.VolumeSource.ConfigMap.Items[0].Path)
-
- m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == "i-resource-003" })
- assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/resources/res4.txt", m.MountPath)
+ assert.Len(t, vols, 3)
+ assert.Len(t, mnts, 3)
- v = findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == "test-configmap" })
+ v := findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == "test-configmap" })
assert.NotNil(t, v)
assert.NotNil(t, v.VolumeSource.ConfigMap)
assert.NotNil(t, v.VolumeSource.ConfigMap.LocalObjectReference)
assert.Equal(t, "test-configmap", v.VolumeSource.ConfigMap.LocalObjectReference.Name)
- m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == "test-configmap" })
+ m := findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == "test-configmap" })
assert.NotNil(t, m)
assert.Equal(t, path.Join(camel.ConfigConfigmapsMountPath, "test-configmap"), m.MountPath)
@@ -389,72 +312,6 @@ func TestConfigureVolumesAndMountsSources(t *testing.T) {
assert.NotNil(t, m)
}
-func TestConfigureVolumesAndMountsBinaryAndTextResources(t *testing.T) {
- env := Environment{
- Resources: kubernetes.NewCollection(),
- Integration: &v1.Integration{
- ObjectMeta: metav1.ObjectMeta{
- Name: TestDeploymentName,
- Namespace: "ns",
- },
- Spec: v1.IntegrationSpec{
- Resources: []v1.ResourceSpec{
- {
- DataSpec: v1.DataSpec{
- Name: "res1.bin",
- RawContent: []byte{1, 2, 3, 4},
- ContentRef: "my-cm1",
- ContentKey: "my-binary",
- ContentType: "application/octet-stream",
- },
- Type: "data",
- },
- {
- DataSpec: v1.DataSpec{
- Name: "res2.txt",
- ContentRef: "my-cm2",
- Content: "hello",
- ContentKey: "my-text",
- ContentType: "text/plain",
- },
- Type: "data",
- },
- },
- },
- },
- }
-
- vols := make([]corev1.Volume, 0)
- mnts := make([]corev1.VolumeMount, 0)
-
- env.configureVolumesAndMounts(&vols, &mnts)
-
- assert.Len(t, vols, 2)
- assert.Len(t, mnts, 2)
-
- v := findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == "my-cm1" })
- assert.NotNil(t, v)
- assert.NotNil(t, v.VolumeSource.ConfigMap)
- assert.Len(t, v.VolumeSource.ConfigMap.Items, 1)
- assert.Equal(t, "my-binary", v.VolumeSource.ConfigMap.Items[0].Key)
- assert.Equal(t, "res1.bin", v.VolumeSource.ConfigMap.Items[0].Path)
-
- m := findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == v.Name })
- assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/resources/res1.bin", m.MountPath)
-
- v = findVolume(vols, func(v corev1.Volume) bool { return v.ConfigMap.Name == "my-cm2" })
- assert.NotNil(t, v)
- assert.NotNil(t, v.VolumeSource.ConfigMap)
- assert.Len(t, v.VolumeSource.ConfigMap.Items, 1)
- assert.Equal(t, "my-text", v.VolumeSource.ConfigMap.Items[0].Key)
- assert.Equal(t, "res2.txt", v.VolumeSource.ConfigMap.Items[0].Path)
-
- m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return m.Name == v.Name })
- assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/resources/res2.txt", m.MountPath)
-}
-
func TestOnlySomeTraitsInfluenceBuild(t *testing.T) {
c := NewTraitTestCatalog()
buildTraits := []string{"builder", "camel", "quarkus", "registry"}
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index c420e0095..4b9d29f78 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -468,33 +468,6 @@ func (e *Environment) configureVolumesAndMounts(vols *[]corev1.Volume, mnts *[]c
*mnts = append(*mnts, *mnt)
}
- for i, r := range e.Integration.Resources() {
- if r.Type == v1.ResourceTypeOpenAPI {
- continue
- }
-
- cmName := fmt.Sprintf("%s-resource-%03d", e.Integration.Name, i)
- refName := fmt.Sprintf("i-resource-%03d", i)
- resName := strings.TrimPrefix(r.Name, "/")
- cmKey := "content"
- resPath := getResourcePath(resName, r.Path, r.Type)
-
- if r.ContentRef != "" {
- cmName = r.ContentRef
- }
- if r.ContentKey != "" {
- cmKey = r.ContentKey
- }
- if r.MountPath != "" {
- resPath = r.MountPath
- }
- vol := getVolume(refName, "configmap", cmName, cmKey, resName)
- mnt := getMount(refName, resPath, resName, true)
-
- *vols = append(*vols, *vol)
- *mnts = append(*mnts, *mnt)
- }
-
if e.Resources != nil {
e.Resources.VisitConfigMap(func(configMap *corev1.ConfigMap) {
propertiesType := configMap.Labels["camel.apache.org/properties.type"]
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index 478604cce..1e7daeb8b 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -114,14 +114,10 @@ func collectConfigurations(configurationType string, configurable ...v1.Configur
continue
}
- // nolint: staticcheck,nolintlint
for _, entry := range entries {
if entry.Type == configurationType {
item := make(map[string]string)
item["value"] = entry.Value
- item["resourceType"] = entry.ResourceType
- item["resourceMountPoint"] = entry.ResourceMountPoint
- item["resourceKey"] = entry.ResourceKey
result = append(result, item)
}
}
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index 375d9ba47..3186620a2 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -95,8 +95,7 @@ func GenerateCatalog(
}
var caCerts [][]byte
- // nolint: staticcheck
- secrets := mergeSecrets(mvn.CASecrets, mvn.CASecret)
+ secrets := mvn.CASecrets
if secrets != nil {
caCerts, err = kubernetes.GetSecretsRefData(ctx, client, namespace, secrets)
if err != nil {
diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go
index 2c1ea63b0..ee119a452 100644
--- a/pkg/util/digest/digest.go
+++ b/pkg/util/digest/digest.go
@@ -76,13 +76,6 @@ func ComputeForIntegration(integration *v1.Integration) (string, error) {
}
}
- // Integration resources
- for _, item := range integration.Spec.Resources {
- if _, err := hash.Write([]byte(item.Content)); err != nil {
- return "", err
- }
- }
-
// Integration flows
if len(integration.Spec.Flows) > 0 {
flows, err := dsl.ToYamlDSL(integration.Spec.Flows)
diff --git a/pkg/util/kubernetes/resolver.go b/pkg/util/kubernetes/resolver.go
index c70f56464..8adb47b71 100644
--- a/pkg/util/kubernetes/resolver.go
+++ b/pkg/util/kubernetes/resolver.go
@@ -119,29 +119,3 @@ func ResolveIntegrationSources(
return GetConfigMap(context, client, name, integration.Namespace)
})
}
-
-// ResolveIntegrationResources --.
-func ResolveIntegrationResources(
- context context.Context,
- client controller.Reader,
- integration *v1.Integration,
- resources *Collection) ([]v1.ResourceSpec, error) {
-
- if integration == nil {
- return nil, nil
- }
-
- return ResolveResource(integration.Spec.Resources, func(name string) (*corev1.ConfigMap, error) {
- // the config map could be part of the resources created
- // by traits
- cm := resources.GetConfigMap(func(m *corev1.ConfigMap) bool {
- return m.Name == name
- })
-
- if cm != nil {
- return cm, nil
- }
-
- return GetConfigMap(context, client, name, integration.Namespace)
- })
-}