This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.10.x by this push:
new a969bb560 backport: Use jolokia version defined in camel-k-runtime-bom
a969bb560 is described below
commit a969bb56049f2235204ce6aa88b5172c84d9b93c
Author: Claudio Miranda <[email protected]>
AuthorDate: Tue Jan 31 17:51:08 2023 -0300
backport: Use jolokia version defined in camel-k-runtime-bom
---
pkg/trait/jolokia.go | 13 +++++++++----
pkg/trait/jolokia_test.go | 8 ++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 209fbf36a..4e1377fdd 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -61,9 +61,7 @@ func (t *jolokiaTrait) Apply(e *Environment) error {
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies,
"camel-quarkus:management")
util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel:jaxb")
}
-
- // TODO: We may want to make the Jolokia version configurable
- util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies,
"mvn:org.jolokia:jolokia-jvm:jar:1.7.1")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies,
"mvn:org.jolokia:jolokia-jvm")
return nil
}
@@ -122,7 +120,14 @@ func (t *jolokiaTrait) Apply(e *Environment) error {
optionValues[i] = k + "=" + options[k]
}
- container.Args = append(container.Args,
"-javaagent:dependencies/lib/main/org.jolokia.jolokia-jvm-1.7.1.jar="+strings.Join(optionValues,
","))
+ jolokiaFilepath := ""
+ for _, ar := range e.IntegrationKit.Status.Artifacts {
+ if strings.HasPrefix(ar.ID, "org.jolokia.jolokia-jvm") {
+ jolokiaFilepath = ar.Target
+ break
+ }
+ }
+ container.Args = append(container.Args,
"-javaagent:"+jolokiaFilepath+"="+strings.Join(optionValues, ","))
containerPort := corev1.ContainerPort{
Name: "jolokia",
diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go
index 13a07c09d..c5b8c6674 100644
--- a/pkg/trait/jolokia_test.go
+++ b/pkg/trait/jolokia_test.go
@@ -281,6 +281,14 @@ func createNominalJolokiaTest() (*jolokiaTrait,
*Environment) {
Spec: v1.IntegrationKitSpec{
Profile: v1.TraitProfileKubernetes,
},
+ Status: v1.IntegrationKitStatus{
+ Artifacts: []v1.Artifact{
+ {
+ ID:
"org.jolokia.jolokia-jvm-1.7.1.jar",
+ Target:
"dependencies/lib/main/org.jolokia.jolokia-jvm-1.7.1.jar",
+ },
+ },
+ },
},
Resources: kubernetes.NewCollection(
&appsv1.Deployment{
