Skip to content

Commit e7eab66

Browse files
philipgoughphilipgough
authored
Bump operator version in production (#792)
1 parent c4d0cee commit e7eab66

File tree

4 files changed

+57
-55
lines changed

4 files changed

+57
-55
lines changed

‎magefiles/cr.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package main
22

33
import (
4+
"sort"
5+
46
kghelpers "github.com/observatorium/observatorium/configuration_go/kubegen/helpers"
57
"github.com/observatorium/observatorium/configuration_go/kubegen/openshift"
68
routev1 "github.com/openshift/api/route/v1"
79
templatev1 "github.com/openshift/api/template/v1"
810
"github.com/philipgough/mimic/encoding"
911
"github.com/thanos-community/thanos-operator/api/v1alpha1"
10-
"sort"
1112

1213
corev1 "k8s.io/api/core/v1"
1314
"k8s.io/apimachinery/pkg/api/resource"
@@ -818,8 +819,8 @@ func rulerCR(namespace string, m TemplateMaps) runtime.Object {
818819

819820
func compactTempProduction() []runtime.Object {
820821
ns := "rhobs-production"
821-
image := currentThanosImageProd
822-
version := currentThanosVersionProd
822+
image := thanosImage
823+
version := thanosVersionProd
823824
storageBucket := "TELEMETER"
824825

825826
m := ProductionMaps

‎magefiles/template.go

+49-48
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ func TemplateFn[T any](param string, m ParamMap[T]) T {
3535
}
3636

3737
const (
38-
currentThanosImageStage = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos"
39-
currentThanosVersionStage = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"
38+
thanosImage = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos"
39+
thanosVersionStage = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"
40+
thanosVersionProd = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"
4041

41-
currentThanosImageProd = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos"
42-
currentThanosVersionProd = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"
43-
44-
thanosOperatorStage = "9a9d855a9b292274114239ca9859b19fc5c83322"
45-
thanosOperatorProd = "9a9d855a9b292274114239ca9859b19fc5c83322"
42+
thanosOperatorImage = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-konflux-thanos-operator"
43+
thanosOperatorVersionStage = "9a9d855a9b292274114239ca9859b19fc5c83322"
44+
thanosOperatorVersionProd = "2e19cebd4c056d661b2b0f6bd797bbe367e619fa"
45+
)
4646

47+
const (
4748
memcachedTag = "1.5-316"
4849
memcachedImage = "registry.redhat.io/rhel8/memcached" + ":" + memcachedTag
4950
memcachedExporterImage = "quay.io/prometheus/memcached-exporter:v0.15.0"
@@ -63,20 +64,20 @@ var logLevels = []string{"debug", "info", "warn", "error"}
6364

6465
// Stage images.
6566
var StageImages = ParamMap[string]{
66-
"STORE02W": currentThanosImageStage,
67-
"STORE2W90D": currentThanosImageStage,
68-
"STORE90D+": currentThanosImageStage,
69-
"STORE_DEFAULT": currentThanosImageStage,
70-
"RECEIVE_ROUTER": currentThanosImageStage,
71-
"RECEIVE_INGESTOR_TELEMETER": currentThanosImageStage,
72-
"RECEIVE_INGESTOR_DEFAULT": currentThanosImageStage,
73-
"RULER": currentThanosImageStage,
74-
"COMPACT_DEFAULT": currentThanosImageStage,
75-
"COMPACT_TELEMETER": currentThanosImageStage,
76-
"QUERY": currentThanosImageStage,
77-
"QUERY_FRONTEND": currentThanosImageStage,
67+
"STORE02W": thanosImage,
68+
"STORE2W90D": thanosImage,
69+
"STORE90D+": thanosImage,
70+
"STORE_DEFAULT": thanosImage,
71+
"RECEIVE_ROUTER": thanosImage,
72+
"RECEIVE_INGESTOR_TELEMETER": thanosImage,
73+
"RECEIVE_INGESTOR_DEFAULT": thanosImage,
74+
"RULER": thanosImage,
75+
"COMPACT_DEFAULT": thanosImage,
76+
"COMPACT_TELEMETER": thanosImage,
77+
"QUERY": thanosImage,
78+
"QUERY_FRONTEND": thanosImage,
7879
jaeger: "registry.redhat.io/rhosdt/jaeger-agent-rhel8:1.57.0-10",
79-
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorStage,
80+
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorVersionStage,
8081
"KUBE_RBAC_PROXY": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:98455d503b797b6b02edcfd37045c8fab0796b95ee5cf4cfe73b221a07e805f0",
8182
apiCache: memcachedImage,
8283
memcachedExporter: memcachedExporterImage,
@@ -86,18 +87,18 @@ var StageImages = ParamMap[string]{
8687

8788
// Stage images.
8889
var StageVersions = ParamMap[string]{
89-
"STORE02W": currentThanosVersionStage,
90-
"STORE2W90D": currentThanosVersionStage,
91-
"STORE90D+": currentThanosVersionStage,
92-
"STORE_DEFAULT": currentThanosVersionStage,
93-
"RECEIVE_ROUTER": currentThanosVersionStage,
94-
"RECEIVE_INGESTOR_TELEMETER": currentThanosVersionStage,
95-
"RECEIVE_INGESTOR_DEFAULT": currentThanosVersionStage,
96-
"RULER": currentThanosVersionStage,
97-
"COMPACT_DEFAULT": currentThanosVersionStage,
98-
"COMPACT_TELEMETER": currentThanosVersionStage,
99-
"QUERY": currentThanosVersionStage,
100-
"QUERY_FRONTEND": currentThanosVersionStage,
90+
"STORE02W": thanosVersionStage,
91+
"STORE2W90D": thanosVersionStage,
92+
"STORE90D+": thanosVersionStage,
93+
"STORE_DEFAULT": thanosVersionStage,
94+
"RECEIVE_ROUTER": thanosVersionStage,
95+
"RECEIVE_INGESTOR_TELEMETER": thanosVersionStage,
96+
"RECEIVE_INGESTOR_DEFAULT": thanosVersionStage,
97+
"RULER": thanosVersionStage,
98+
"COMPACT_DEFAULT": thanosVersionStage,
99+
"COMPACT_TELEMETER": thanosVersionStage,
100+
"QUERY": thanosVersionStage,
101+
"QUERY_FRONTEND": thanosVersionStage,
101102
apiCache: memcachedTag,
102103
observatoriumAPI: "9aada65247a07782465beb500323a0e18d7e3d05",
103104
}
@@ -341,13 +342,13 @@ var StageObjectStorageBucket = ParamMap[v1alpha1.ObjectStorageConfig]{
341342

342343
// ProductionImages is a map of production images.
343344
var ProductionImages = ParamMap[string]{
344-
"STORE02W": currentThanosImageProd,
345-
"STORE2W90D": currentThanosImageProd,
346-
"STORE90D+": currentThanosImageProd,
347-
"STORE_DEFAULT": currentThanosImageProd,
348-
"QUERY": currentThanosImageProd,
349-
"QUERY_FRONTEND": currentThanosImageProd,
350-
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorStage,
345+
"STORE02W": thanosImage,
346+
"STORE2W90D": thanosImage,
347+
"STORE90D+": thanosImage,
348+
"STORE_DEFAULT": thanosImage,
349+
"QUERY": thanosImage,
350+
"QUERY_FRONTEND": thanosImage,
351+
"THANOS_OPERATOR": fmt.Sprintf("%s:%s", thanosOperatorImage, thanosOperatorVersionProd),
351352
"KUBE_RBAC_PROXY": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:98455d503b797b6b02edcfd37045c8fab0796b95ee5cf4cfe73b221a07e805f0",
352353
apiCache: memcachedImage,
353354
memcachedExporter: memcachedExporterImage,
@@ -357,12 +358,12 @@ var ProductionImages = ParamMap[string]{
357358

358359
// ProductionVersions is a map of production versions.
359360
var ProductionVersions = ParamMap[string]{
360-
"STORE02W": currentThanosVersionProd,
361-
"STORE2W90D": currentThanosVersionProd,
362-
"STORE90D+": currentThanosVersionProd,
363-
"STORE_DEFAULT": currentThanosVersionProd,
364-
"QUERY": currentThanosVersionProd,
365-
"QUERY_FRONTEND": currentThanosVersionProd,
361+
"STORE02W": thanosVersionProd,
362+
"STORE2W90D": thanosVersionProd,
363+
"STORE90D+": thanosVersionProd,
364+
"STORE_DEFAULT": thanosVersionProd,
365+
"QUERY": thanosVersionProd,
366+
"QUERY_FRONTEND": thanosVersionProd,
366367
apiCache: memcachedTag,
367368
observatoriumAPI: "9aada65247a07782465beb500323a0e18d7e3d05",
368369
}
@@ -387,10 +388,10 @@ var ProductionStorageSize = ParamMap[v1alpha1.StorageSize]{
387388

388389
// ProductionReplicas is a map of production replicas.
389390
var ProductionReplicas = ParamMap[int32]{
390-
"STORE02W": 3,
391+
"STORE02W": 2,
391392
"STORE2W90D": 2,
392-
"STORE90D+": 3,
393-
"STORE_DEFAULT": 3,
393+
"STORE90D+": 2,
394+
"STORE_DEFAULT": 2,
394395
"QUERY": 6,
395396
"QUERY_FRONTEND": 3,
396397
apiCache: 1,

‎resources/services/bundle/production/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ objects:
109109
- --zap-log-level=debug
110110
command:
111111
- /manager
112-
image: quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:9a9d855a9b292274114239ca9859b19fc5c83322
112+
image: quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-konflux-thanos-operator:2e19cebd4c056d661b2b0f6bd797bbe367e619fa
113113
imagePullPolicy: IfNotPresent
114114
livenessProbe:
115115
failureThreshold: 3

‎resources/services/rhobs-thanos-operator/production/rhobs.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ objects:
8383
key: thanos.yaml
8484
name: observatorium-mst-thanos-objectstorage
8585
optional: false
86-
replicas: 3
86+
replicas: 2
8787
resourceRequirements:
8888
requests:
8989
cpu: 50m
@@ -389,7 +389,7 @@ objects:
389389
key: thanos.yaml
390390
name: thanos-objectstorage
391391
optional: false
392-
replicas: 3
392+
replicas: 2
393393
resourceRequirements:
394394
requests:
395395
cpu: 50m
@@ -578,7 +578,7 @@ objects:
578578
key: thanos.yaml
579579
name: thanos-objectstorage
580580
optional: false
581-
replicas: 3
581+
replicas: 2
582582
resourceRequirements:
583583
requests:
584584
cpu: 50m

0 commit comments

Comments
 (0)