Skip to content

Commit

Permalink
fix(#5097): Remove secondary IntegrationPlatform in favor of using In…
Browse files Browse the repository at this point in the history
…tegrationProfile

- Remove secondary IntegrationPlatform mode
- Reduce logic to a single IntegrationPlatform per operator instance
- Introduce IntegrationProfile custom resource definition
- Let user customize a subset of IntegrationPlatform settings in IntegrationProfile
- Load IntegrationProfile settings when integration resource is annotated to select the profile
- Remove platform creation as part of the platform trait (avoids duplicate platform resources)
- Save trait configuration used to build the integration kit on the resource spec for future reference
  • Loading branch information
christophd committed Feb 5, 2024
1 parent a80ea61 commit eac72eb
Show file tree
Hide file tree
Showing 121 changed files with 11,015 additions and 1,193 deletions.
2 changes: 1 addition & 1 deletion .github/actions/kamel-cleanup/clean-orphan-resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

set +e

resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds pipes kameletbindings"
resourcetypes="integrations integrationkits integrationplatforms integrationprofiles camelcatalogs kamelets builds pipes kameletbindings"

#
# Loop through the resource types
Expand Down
38 changes: 6 additions & 32 deletions config/crd/bases/camel.apache.org_integrationplatforms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
baseImage:
description: a base image that can be used as base layer for all
images. It can be useful if you want to provide some custom
base image with further utility softwares
base image with further utility software
type: string
buildCatalogToolTimeout:
description: 'the timeout (in seconds) to use when creating the
Expand Down Expand Up @@ -428,8 +428,8 @@ spec:
repositories:
description: remote repository used to retrieve Kamelet catalog
items:
description: IntegrationPlatformKameletRepositorySpec defines
the location of the Kamelet catalog to use.
description: KameletRepositorySpec defines the location of the
Kamelet catalog to use.
properties:
uri:
description: the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
Expand Down Expand Up @@ -1558,27 +1558,14 @@ spec:
platform:
description: The configuration of Platform trait
properties:
auto:
description: To automatically detect from the environment
if a default platform can be created (it will be created
on OpenShift only).
type: boolean
configuration:
description: 'Legacy trait configuration parameters. Deprecated:
for backward compatibility.'
type: object
x-kubernetes-preserve-unknown-fields: true
createDefault:
description: To create a default (empty) platform when the
platform is missing.
type: boolean
enabled:
description: 'Deprecated: no longer in use.'
type: boolean
global:
description: Indicates if the platform should be created globally
in the case of global operator (default true).
type: boolean
type: object
pod:
description: The configuration of Pod trait
Expand Down Expand Up @@ -1907,7 +1894,7 @@ spec:
baseImage:
description: a base image that can be used as base layer for all
images. It can be useful if you want to provide some custom
base image with further utility softwares
base image with further utility software
type: string
buildCatalogToolTimeout:
description: 'the timeout (in seconds) to use when creating the
Expand Down Expand Up @@ -2280,8 +2267,8 @@ spec:
repositories:
description: remote repository used to retrieve Kamelet catalog
items:
description: IntegrationPlatformKameletRepositorySpec defines
the location of the Kamelet catalog to use.
description: KameletRepositorySpec defines the location of the
Kamelet catalog to use.
properties:
uri:
description: the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
Expand Down Expand Up @@ -3418,27 +3405,14 @@ spec:
platform:
description: The configuration of Platform trait
properties:
auto:
description: To automatically detect from the environment
if a default platform can be created (it will be created
on OpenShift only).
type: boolean
configuration:
description: 'Legacy trait configuration parameters. Deprecated:
for backward compatibility.'
type: object
x-kubernetes-preserve-unknown-fields: true
createDefault:
description: To create a default (empty) platform when the
platform is missing.
type: boolean
enabled:
description: 'Deprecated: no longer in use.'
type: boolean
global:
description: Indicates if the platform should be created globally
in the case of global operator (default true).
type: boolean
type: object
pod:
description: The configuration of Pod trait
Expand Down
Loading

0 comments on commit eac72eb

Please sign in to comment.