Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions e2e/common/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,6 @@ func TestRunConfigProperties(t *testing.T) {
g.Eventually(IntegrationLogs(t, ctx, ns, "property-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-property-value"))
})

t.Run("Property from Secret inlined", func(t *testing.T) {
var secData = make(map[string]string)
secData["my-message"] = "my-secret-external-value"
err := CreatePlainTextSecret(t, ctx, ns, "my-sec-inlined", secData)
g.Expect(err).To(BeNil())

g.Expect(KamelRun(t, ctx, ns, "./files/property-secret-route.yaml", "-t", "mount.configs=secret:my-sec-inlined").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ctx, ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationConditionStatus(t, ctx, ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationLogs(t, ctx, ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value"))
})

})
}

Expand Down
25 changes: 0 additions & 25 deletions e2e/common/config/files/property-secret-route.yaml

This file was deleted.

15 changes: 14 additions & 1 deletion pkg/controller/integrationplatform/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,20 @@ func (action *monitorAction) addPlainQuarkusCatalog(ctx context.Context, catalog
}
runtimesProps := clonedCatalog.Spec.Runtime.Capabilities["master"].RuntimeProperties
clonedCatalog.Spec.Runtime.Capabilities["master"] = v1.Capability{
Dependencies: []v1.MavenArtifact{},
Dependencies: []v1.MavenArtifact{
{
GroupID: "org.apache.camel.quarkus",
ArtifactID: "camel-quarkus-master",
},
{
GroupID: "org.apache.camel.quarkus",
ArtifactID: "camel-quarkus-kubernetes",
},
{
GroupID: "org.apache.camel.quarkus",
ArtifactID: "camel-quarkus-kubernetes-cluster-service",
},
},
RuntimeProperties: runtimesProps,
}
clonedCatalog.Spec.Runtime.Capabilities["resume-kafka"] = v1.Capability{
Expand Down
21 changes: 13 additions & 8 deletions pkg/trait/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading