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
The following commit(s) were added to refs/heads/main by this push:
new 814cf7d2f fix: minor changes in quarkus >= 3.31
814cf7d2f is described below
commit 814cf7d2fcec44f68285ae1b91a1d11212d37f86
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Sat Mar 14 10:04:58 2026 +0100
fix: minor changes in quarkus >= 3.31
---
e2e/common/traits/kamelet_test.go | 3 ++-
helm/camel-k/templates/rbacs-descoped.yaml | 1 +
pkg/resources/config/rbac/descoped/operator-cluster-role.yaml | 1 +
pkg/trait/builder.go | 3 +++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/e2e/common/traits/kamelet_test.go
b/e2e/common/traits/kamelet_test.go
index 9fa431969..daa17ded8 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -56,7 +56,8 @@ func TestKameletDiscoverCapabilities(t *testing.T) {
g.Expect(KamelRun(t, ctx, ns, "files/webhook.yaml",
"--name", name).Execute()).To(Succeed())
g.Eventually(IntegrationConditionStatus(t, ctx, ns,
name, v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
g.Eventually(IntegrationPodPhase(t, ctx, ns, name),
TestTimeoutShort).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutShort).Should(ContainSubstring("Started route1
(kamelet://capabilities-webhook-source)"))
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutShort).Should(ContainSubstring("Started route1"))
+ g.Eventually(IntegrationLogs(t, ctx, ns, name),
TestTimeoutShort).Should(ContainSubstring("capabilities-webhook-source"))
// Verify Integration capabilities
g.Eventually(IntegrationStatusCapabilities(t, ctx, ns,
name), TestTimeoutShort).Should(ContainElements("platform-http"))
// Verify expected resources from Kamelet (Service in
this case)
diff --git a/helm/camel-k/templates/rbacs-descoped.yaml
b/helm/camel-k/templates/rbacs-descoped.yaml
index 66fd8d427..433a8046b 100644
--- a/helm/camel-k/templates/rbacs-descoped.yaml
+++ b/helm/camel-k/templates/rbacs-descoped.yaml
@@ -140,6 +140,7 @@ rules:
- get
- list
- patch
+ - watch
- apiGroups:
- storage.k8s.io
resources:
diff --git a/pkg/resources/config/rbac/descoped/operator-cluster-role.yaml
b/pkg/resources/config/rbac/descoped/operator-cluster-role.yaml
index 54147b9f9..8a537581b 100644
--- a/pkg/resources/config/rbac/descoped/operator-cluster-role.yaml
+++ b/pkg/resources/config/rbac/descoped/operator-cluster-role.yaml
@@ -143,6 +143,7 @@ rules:
- get
- list
- patch
+ - watch
# Required by mount trait
- apiGroups:
- storage.k8s.io
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 0ae5229a8..81755a742 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -128,6 +128,9 @@ func (t *builderTrait) configureForQuarkus(trait Trait, e
*Environment, conditio
if nativeBuilderImage == "" {
// default from the catalog
nativeBuilderImage =
e.CamelCatalog.GetQuarkusToolingImage()
+ // GraalVM expected version is 25.0.0 starting from
Quarkus 3.31
+ // As we cannot change the catalog, until we reach 3.x,
we can patch it here
+ nativeBuilderImage =
strings.ReplaceAll(nativeBuilderImage, "jdk-21", "jdk-25")
}
// it should be performed as the last custom task
