Skip to content

Commit cde32b7

Browse files
Bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.86.2 to 0.87.0 (#2179)
* Bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.86.2 to 0.87.0. - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](prometheus-operator/prometheus-operator@v0.86.2...v0.87.0) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-version: 0.87.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix prom api breaking changes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joel Takvorian <jtakvori@redhat.com>
1 parent 84f4f31 commit cde32b7

File tree

14 files changed

+125
-42
lines changed

14 files changed

+125
-42
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/onsi/ginkgo/v2 v2.27.5
1313
github.com/onsi/gomega v1.39.0
1414
github.com/openshift/api v0.0.0-20250707164913-2cd5821c9080
15-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.2
15+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.0
1616
github.com/prometheus/common v0.67.5
1717
github.com/sirupsen/logrus v1.9.4
1818
github.com/stretchr/testify v1.11.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8
138138
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
139139
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
140140
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
141-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.2 h1:VRXUgbGmpmjZgFYiUnTwlC+JjfCUs5KKFsorJhI1ZKQ=
142-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.86.2/go.mod h1:nPk0OteXBkbT0CRCa2oZQL1jRLW6RJ2fuIijHypeJdk=
141+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.0 h1:QK37j5ZUtBwbyZkF4BBAs3bQQ1gYKG8e+g1BdNZBr/M=
142+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.0/go.mod h1:WHiLZmOWVop/MoYvRD58LfnPeyE+dcITby/jQjg83Hw=
143143
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
144144
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
145145
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=

internal/controller/consoleplugin/consoleplugin_objects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (b *builder) serviceMonitor() *monitoringv1.ServiceMonitor {
125125
{
126126
Port: metricsPortName,
127127
Interval: "15s",
128-
Scheme: "https",
128+
Scheme: ptr.To(monitoringv1.SchemeHTTPS),
129129
TLSConfig: &monitoringv1.TLSConfig{
130130
SafeTLSConfig: monitoringv1.SafeTLSConfig{
131131
ServerName: ptr.To(serverName),

internal/controller/ebpf/agent_metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (c *AgentController) promServiceMonitoring(target *flowslatest.FlowCollecto
104104
{
105105
Port: "metrics",
106106
Interval: "30s",
107-
Scheme: scheme,
107+
Scheme: &scheme,
108108
TLSConfig: smTLS,
109109
},
110110
},

internal/controller/flp/flp_common_objects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ func serviceMonitor(desired *flowslatest.FlowCollectorSpec, smName, svcName, nam
359359
{
360360
Port: prometheusPortName,
361361
Interval: "15s",
362-
Scheme: scheme,
362+
Scheme: &scheme,
363363
TLSConfig: smTLS,
364364
HonorLabels: true,
365365
// Relabel for Thanos multi-tenant endpoint, which requires having the namespace label

internal/controller/flp/flp_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/netobserv/network-observability-operator/internal/pkg/helper"
1616
"github.com/netobserv/network-observability-operator/internal/pkg/manager/status"
1717
"github.com/netobserv/network-observability-operator/internal/pkg/metrics/alerts"
18+
v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1819

1920
"github.com/stretchr/testify/assert"
2021
appsv1 "k8s.io/api/apps/v1"
@@ -555,7 +556,7 @@ func TestServiceMonitorChanged(t *testing.T) {
555556
// Check scheme changed
556557
b, _ = newMonolithBuilder(info.NewInstance(image2, status.Instance{}), &cfg, b.flowMetrics, nil, nil)
557558
fourth := b.serviceMonitor()
558-
fourth.Spec.Endpoints[0].Scheme = "https"
559+
fourth.Spec.Endpoints[0].Scheme = ptr.To(v1.SchemeHTTPS)
559560

560561
report = helper.NewChangeReport("")
561562
assert.True(helper.ServiceMonitorChanged(third, fourth, &report))

internal/pkg/helper/monitoring.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ func GetSecretOrConfigMap(file *flowslatest.FileReference) monitoringv1.SecretOr
2828
}
2929
}
3030

31-
func GetServiceMonitorTLSConfig(tls *flowslatest.ServerTLS, serverName string, isDownstream bool) (string, *monitoringv1.TLSConfig) {
31+
func GetServiceMonitorTLSConfig(tls *flowslatest.ServerTLS, serverName string, isDownstream bool) (monitoringv1.Scheme, *monitoringv1.TLSConfig) {
3232
if tls.Type == flowslatest.ServerTLSAuto {
3333
if isDownstream {
34-
return "https", &monitoringv1.TLSConfig{
34+
return monitoringv1.SchemeHTTPS, &monitoringv1.TLSConfig{
3535
SafeTLSConfig: monitoringv1.SafeTLSConfig{
3636
ServerName: ptr.To(serverName),
3737
},
3838
CAFile: "/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt",
3939
}
4040
}
4141
// Upstream prometheus disallows CAFile
42-
return "https", &monitoringv1.TLSConfig{
42+
return monitoringv1.SchemeHTTPS, &monitoringv1.TLSConfig{
4343
SafeTLSConfig: monitoringv1.SafeTLSConfig{
4444
ServerName: ptr.To(serverName),
4545
CA: monitoringv1.SecretOrConfigMap{
@@ -64,8 +64,8 @@ func GetServiceMonitorTLSConfig(tls *flowslatest.ServerTLS, serverName string, i
6464
if !tls.InsecureSkipVerify && tls.ProvidedCaFile != nil && tls.ProvidedCaFile.File != "" {
6565
tlsOut.SafeTLSConfig.CA = GetSecretOrConfigMap(tls.ProvidedCaFile)
6666
}
67-
return "https", &tlsOut
67+
return monitoringv1.SchemeHTTPS, &tlsOut
6868
}
6969

70-
return "http", nil
70+
return monitoringv1.SchemeHTTP, nil
7171
}

vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/podmonitor_types.go

Lines changed: 20 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/probe_types.go

Lines changed: 13 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheus_types.go

Lines changed: 20 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)