Skip to content

Commit 6d3b082

Browse files
authored
Merge pull request #878 from ajayk/prometheus-operator-update
update prometheus-operator to version v0.75.2
2 parents cacfb7b + e4383e0 commit 6d3b082

File tree

9 files changed

+305
-121
lines changed

9 files changed

+305
-121
lines changed

controllers/object_controls.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -4552,9 +4552,14 @@ func ServiceMonitor(n ClusterPolicyController) (gpuv1.State, error) {
45524552
obj.ObjectMeta.Labels[key] = value
45534553
}
45544554
}
4555-
45564555
if serviceMonitor.Relabelings != nil {
4557-
obj.Spec.Endpoints[0].RelabelConfigs = serviceMonitor.Relabelings
4556+
relabelConfigs := make([]promv1.RelabelConfig, len(serviceMonitor.Relabelings))
4557+
for i, relabel := range serviceMonitor.Relabelings {
4558+
if relabel != nil {
4559+
relabelConfigs[i] = *relabel
4560+
}
4561+
}
4562+
obj.Spec.Endpoints[0].RelabelConfigs = relabelConfigs
45584563
}
45594564
}
45604565
if n.stateNames[state] == "state-operator-metrics" || n.stateNames[state] == "state-node-status-exporter" {

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/openshift/api v0.0.0-20240625084701-0689f006bcde
1919
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
2020
github.com/operator-framework/api v0.26.0
21-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
21+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2
2222
github.com/prometheus/client_golang v1.19.1
2323
github.com/regclient/regclient v0.7.1
2424
github.com/sirupsen/logrus v1.9.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
298298
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
299299
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
300300
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
301-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 h1:GwlGJPK6vf1UIohpc72KJVkKYlzki1UgE3xC4bWbf20=
302-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2/go.mod h1:yJ3CawR/A5qEYFEeCOUVYLTwYxmacfHQhJS+b/2QiaM=
301+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 h1:6UsAv+jAevuGO2yZFU/BukV4o9NKnFMOuoouSA4G0ns=
302+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2/go.mod h1:XYrdZw5dW12Cjkt4ndbeNZZTBp4UCHtW0ccR9+sTtPU=
303303
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
304304
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
305305
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

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

+2-2
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

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)