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 705d34811 chore(deps): bump prometheus to 0.81.0
705d34811 is described below
commit 705d3481152558df6a3b6e6a992e02b37eae2d52
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Thu Mar 20 18:42:28 2025 +0100
chore(deps): bump prometheus to 0.81.0
Supersede #6114
---
go.mod | 8 ++++----
go.sum | 16 ++++++++--------
pkg/trait/prometheus.go | 2 +-
pkg/trait/prometheus_test.go | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/go.mod b/go.mod
index 7995dd276..73dc5b8fc 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
// go get github.com/openshift/api@release-4.15
github.com/openshift/api v0.0.0-20240228005710-4511c790cc60
github.com/operator-framework/api v0.30.0
- github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
v0.76.2
+ github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
v0.81.0
github.com/prometheus/client_golang v1.21.1
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.63.0
@@ -48,11 +48,11 @@ require (
k8s.io/gengo v0.0.0-20240404160639-a0386bf69313
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.32.2
- k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
+ k8s.io/utils v0.0.0-20241210054802-24370beab758
knative.dev/eventing v0.44.3
knative.dev/pkg v0.0.0-20250117084104-c43477f0052b
knative.dev/serving v0.43.1
- sigs.k8s.io/controller-runtime v0.20.2
+ sigs.k8s.io/controller-runtime v0.20.3
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
)
@@ -149,6 +149,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc // indirect
- sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
diff --git a/go.sum b/go.sum
index 67e2de37c..aeea6a5b8 100644
--- a/go.sum
+++ b/go.sum
@@ -352,8 +352,8 @@ github.com/pmezard/go-difflib
v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prashantv/gostub v1.1.0
h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prashantv/gostub v1.1.0/go.mod
h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
-github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2
h1:BpGDC87A2SaxbKgONsFLEX3kRcRJee2aLQbjXsuz0hA=
-github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
v0.76.2/go.mod h1:Rd8YnCqz+2FYsiGmE2DMlaLjQRB4v2jFNnzCt9YY4IM=
+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.81.0
h1:mSii7z+TihzdeULnGjLnNikgtDbeViY/wW8s3430rhE=
+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
v0.81.0/go.mod h1:YfnEQzw7tUQa0Sjiz8V6QFc6JUGE+i5wybsjc3EOKn8=
github.com/prometheus/client_golang v0.9.1/go.mod
h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod
h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.7.1/go.mod
h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -861,8 +861,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
h1:GA7//TjRY9yWGy1poLzYYJ
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod
h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us=
k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod
h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20241210054802-24370beab758
h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
+k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod
h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.44.3 h1:cwL1SCvgtlY/GxK2D3H4L25uF/zky0A5R81sblRryZc=
knative.dev/eventing v0.44.3/go.mod
h1:4ndE/NDntPvunnUl/q7MFbkX0pS/vKaMUFOXFRf1GWA=
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc
h1:0d9XXRLlyuHfINZLlYqo/BYe/+chqqNBMLKJldjTbtw=
@@ -874,10 +874,10 @@ knative.dev/serving v0.43.1/go.mod
h1:KhhRhb3HPyKSm924/QRjqtAj2U0x5UZM217SxVTbib
rsc.io/binaryregexp v0.2.0/go.mod
h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/controller-runtime v0.20.2
h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc=
-sigs.k8s.io/controller-runtime v0.20.2/go.mod
h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod
h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/controller-runtime v0.20.3
h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
+sigs.k8s.io/controller-runtime v0.20.3/go.mod
h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8
h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod
h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016
h1:kXv6kKdoEtedwuqMmkqhbkgvYKeycVbC8+iPCP9j5kQ=
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod
h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 2bf706a84..4ad4fa402 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -137,7 +137,7 @@ func (t *prometheusTrait) getPodMonitorFor(e *Environment,
portName string) (*mo
},
PodMetricsEndpoints: []monitoringv1.PodMetricsEndpoint{
{
- Port: portName,
+ Port: &portName,
Path: "/q/metrics",
},
},
diff --git a/pkg/trait/prometheus_test.go b/pkg/trait/prometheus_test.go
index 48c581d98..ce893e3fb 100644
--- a/pkg/trait/prometheus_test.go
+++ b/pkg/trait/prometheus_test.go
@@ -112,7 +112,7 @@ func TestPrometheusTraitGetPodMonitor(t *testing.T) {
assert.Equal(t, "integration-name",
podMonitor.Labels["camel.apache.org/integration"])
assert.Equal(t, "integration-name",
podMonitor.Spec.Selector.MatchLabels["camel.apache.org/integration"])
assert.Len(t, podMonitor.Spec.PodMetricsEndpoints, 1)
- assert.Equal(t, defaultContainerPortName,
podMonitor.Spec.PodMetricsEndpoints[0].Port)
+ assert.Equal(t, defaultContainerPortName,
*podMonitor.Spec.PodMetricsEndpoints[0].Port)
}
func createNominalPrometheusTest() (*prometheusTrait, *Environment) {
