Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: avoid hardcoded versions for Thanos components #281

Closed
wants to merge 1 commit into from
Closed

fix: avoid hardcoded versions for Thanos components #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ require (
github.com/prometheus/common v0.44.0
github.com/prometheus/prometheus v1.8.2-0.20211105201321-411021ada9ab
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.66.0-rhobs1
github.com/rhobs/obo-prometheus-operator v0.66.0-rhobs1
go.uber.org/zap v1.25.0
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
gotest.tools/v3 v3.5.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/monitoring/monitoring-stack/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
policyv1 "k8s.io/api/policy/v1"
rbacv1 "k8s.io/api/rbac/v1"

po "github.com/rhobs/obo-prometheus-operator/pkg/operator"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -181,8 +182,7 @@ func newPrometheus(
RuleSelector: prometheusSelector,
RuleNamespaceSelector: ms.Spec.NamespaceSelector,
Thanos: &monv1.ThanosSpec{
BaseImage: stringPtr("quay.io/thanos/thanos"),
Version: stringPtr("v0.24.0"),
Image: stringPtr(po.DefaultThanosImage),
},
},
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/monitoring/thanos-querier/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
po "github.com/rhobs/obo-prometheus-operator/pkg/operator"
)

func thanosComponentReconcilers(thanos *msoapi.ThanosQuerier, sidecarUrls []string) []reconciler.Reconciler {
Expand Down Expand Up @@ -68,7 +69,7 @@ func newThanosQuerierDeployment(name string, spec *msoapi.ThanosQuerier, sidecar
{
Name: "thanos-querier",
Args: args,
Image: "quay.io/thanos/thanos:v0.24.0",
Image: po.DefaultThanosImage,
Ports: []corev1.ContainerPort{
{
ContainerPort: 9090,
Expand Down
Loading