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 2025/01/04 09:47:03 UTC
(camel-k) 01/03: fix(trait): mount native plain Quarkus
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 8134e1e0d768d6f0b69b57a463acda90890cac8a
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Sat Jan 4 09:37:35 2025 +0100
fix(trait): mount native plain Quarkus
---
pkg/trait/mount.go | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/pkg/trait/mount.go b/pkg/trait/mount.go
index b1a3d3034..e3a3c0744 100644
--- a/pkg/trait/mount.go
+++ b/pkg/trait/mount.go
@@ -439,15 +439,20 @@ func (t *mountTrait) addSourcesProperties(e *Environment) {
if e.ApplicationProperties == nil {
e.ApplicationProperties = make(map[string]string)
}
- isQuarkusNative := false
- if qt := e.Catalog.GetTrait(quarkusTraitID); qt != nil {
- if quarkus, ok := qt.(*quarkusTrait); ok && quarkus.isNativeIntegration(e) {
- isQuarkusNative = true
+ if e.CamelCatalog.GetRuntimeProvider() == v1.RuntimeProviderPlainQuarkus {
+ sourceLocationEnabled := false
+ for _, s := range e.Integration.AllSources() {
+ // We don't process routes embedded (native) or Kamelets
+ if e.isEmbedded(s) || s.IsGeneratedFromKamelet() {
+ continue
+ }
+ sourceLocationEnabled = true
+ break
+ }
+ if sourceLocationEnabled {
+ e.ApplicationProperties["camel.main.source-location-enabled"] = boolean.TrueString
+ e.ApplicationProperties["camel.main.routes-include-pattern"] = fmt.Sprintf("file:%s/**", camel.SourcesMountPath)
}
- }
- if e.CamelCatalog.GetRuntimeProvider() == v1.RuntimeProviderPlainQuarkus && !isQuarkusNative {
- e.ApplicationProperties["camel.main.source-location-enabled"] = boolean.TrueString
- e.ApplicationProperties["camel.main.routes-include-pattern"] = fmt.Sprintf("file:%s/**", camel.SourcesMountPath)
} else {
idx := 0
for _, s := range e.Integration.AllSources() {