Skip to content

Commit f30338c

Browse files
chore: remove version inference
1 parent 04d682f commit f30338c

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ replace (
4444
github.com/rhobs/observability-operator/pkg/apis => ./pkg/apis
4545
)
4646

47-
require github.com/blang/semver/v4 v4.0.0
48-
4947
require (
5048
cel.dev/expr v0.24.0 // indirect
5149
dario.cat/mergo v1.0.2 // indirect
@@ -54,6 +52,7 @@ require (
5452
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
5553
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5654
github.com/beorn7/perks v1.0.1 // indirect
55+
github.com/blang/semver/v4 v4.0.0 // indirect
5756
github.com/brunoga/deep v1.2.5 // indirect
5857
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
5958
github.com/cespare/xxhash/v2 v2.3.0 // indirect

pkg/controllers/monitoring/monitoring-stack/components.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import (
44
"fmt"
55
"path/filepath"
66
"reflect"
7-
"strings"
87

9-
"github.com/blang/semver/v4"
108
monv1 "github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring/v1"
119
corev1 "k8s.io/api/core/v1"
1210
policyv1 "k8s.io/api/policy/v1"
@@ -138,18 +136,6 @@ func newPrometheus(
138136

139137
config := ms.Spec.PrometheusConfig
140138

141-
detectedVersion := ""
142-
if prometheusCfg.Image != "" {
143-
parts := strings.Split(prometheusCfg.Image, ":")
144-
if len(parts) > 1 {
145-
tag := parts[len(parts)-1]
146-
cleanTag := strings.TrimPrefix(tag, "v")
147-
if _, err := semver.ParseTolerant(cleanTag); err == nil {
148-
detectedVersion = cleanTag
149-
}
150-
}
151-
}
152-
153139
prometheus := &monv1.Prometheus{
154140
TypeMeta: metav1.TypeMeta{
155141
APIVersion: monv1.SchemeGroupVersion.String(),
@@ -216,7 +202,6 @@ func newPrometheus(
216202
RemoteWrite: config.RemoteWrite,
217203
ExternalLabels: config.ExternalLabels,
218204
EnableRemoteWriteReceiver: config.EnableRemoteWriteReceiver,
219-
Version: detectedVersion,
220205
EnableOTLPReceiver: config.EnableOtlpHttpReceiver,
221206
},
222207
Retention: ms.Spec.Retention,

0 commit comments

Comments
 (0)