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

Bump operator version in production #792

Merged
merged 1 commit into from
Mar 25, 2025
Merged

Bump operator version in production #792

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
7 changes: 4 additions & 3 deletions magefiles/cr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package main

import (
"sort"

kghelpers "github.com/observatorium/observatorium/configuration_go/kubegen/helpers"
"github.com/observatorium/observatorium/configuration_go/kubegen/openshift"
routev1 "github.com/openshift/api/route/v1"
templatev1 "github.com/openshift/api/template/v1"
"github.com/philipgough/mimic/encoding"
"github.com/thanos-community/thanos-operator/api/v1alpha1"
"sort"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down Expand Up @@ -816,10 +817,10 @@
}
}

func compactTempProduction() []runtime.Object {

Check failure on line 820 in magefiles/cr.go

View workflow job for this annotation

GitHub Actions / build 

func `compactTempProduction` is unused (unused)
ns := "rhobs-production"
image := currentThanosImageProd
version := currentThanosVersionProd
image := thanosImage
version := thanosVersionProd
storageBucket := "TELEMETER"

m := ProductionMaps
Expand Down
97 changes: 49 additions & 48 deletions magefiles/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,16 @@ func TemplateFn[T any](param string, m ParamMap[T]) T {
}

const (
currentThanosImageStage = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos"
currentThanosVersionStage = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"
thanosImage = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos"
thanosVersionStage = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"
thanosVersionProd = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"

currentThanosImageProd = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos"
currentThanosVersionProd = "c7c3ef94c51d518bb6056d3ad416d7b4f39559f3"

thanosOperatorStage = "9a9d855a9b292274114239ca9859b19fc5c83322"
thanosOperatorProd = "9a9d855a9b292274114239ca9859b19fc5c83322"
thanosOperatorImage = "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-konflux-thanos-operator"
thanosOperatorVersionStage = "9a9d855a9b292274114239ca9859b19fc5c83322"
thanosOperatorVersionProd = "2e19cebd4c056d661b2b0f6bd797bbe367e619fa"
)

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

// Stage images.
var StageImages = ParamMap[string]{
"STORE02W": currentThanosImageStage,
"STORE2W90D": currentThanosImageStage,
"STORE90D+": currentThanosImageStage,
"STORE_DEFAULT": currentThanosImageStage,
"RECEIVE_ROUTER": currentThanosImageStage,
"RECEIVE_INGESTOR_TELEMETER": currentThanosImageStage,
"RECEIVE_INGESTOR_DEFAULT": currentThanosImageStage,
"RULER": currentThanosImageStage,
"COMPACT_DEFAULT": currentThanosImageStage,
"COMPACT_TELEMETER": currentThanosImageStage,
"QUERY": currentThanosImageStage,
"QUERY_FRONTEND": currentThanosImageStage,
"STORE02W": thanosImage,
"STORE2W90D": thanosImage,
"STORE90D+": thanosImage,
"STORE_DEFAULT": thanosImage,
"RECEIVE_ROUTER": thanosImage,
"RECEIVE_INGESTOR_TELEMETER": thanosImage,
"RECEIVE_INGESTOR_DEFAULT": thanosImage,
"RULER": thanosImage,
"COMPACT_DEFAULT": thanosImage,
"COMPACT_TELEMETER": thanosImage,
"QUERY": thanosImage,
"QUERY_FRONTEND": thanosImage,
jaeger: "registry.redhat.io/rhosdt/jaeger-agent-rhel8:1.57.0-10",
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorStage,
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorVersionStage,
"KUBE_RBAC_PROXY": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:98455d503b797b6b02edcfd37045c8fab0796b95ee5cf4cfe73b221a07e805f0",
apiCache: memcachedImage,
memcachedExporter: memcachedExporterImage,
Expand All @@ -86,18 +87,18 @@ var StageImages = ParamMap[string]{

// Stage images.
var StageVersions = ParamMap[string]{
"STORE02W": currentThanosVersionStage,
"STORE2W90D": currentThanosVersionStage,
"STORE90D+": currentThanosVersionStage,
"STORE_DEFAULT": currentThanosVersionStage,
"RECEIVE_ROUTER": currentThanosVersionStage,
"RECEIVE_INGESTOR_TELEMETER": currentThanosVersionStage,
"RECEIVE_INGESTOR_DEFAULT": currentThanosVersionStage,
"RULER": currentThanosVersionStage,
"COMPACT_DEFAULT": currentThanosVersionStage,
"COMPACT_TELEMETER": currentThanosVersionStage,
"QUERY": currentThanosVersionStage,
"QUERY_FRONTEND": currentThanosVersionStage,
"STORE02W": thanosVersionStage,
"STORE2W90D": thanosVersionStage,
"STORE90D+": thanosVersionStage,
"STORE_DEFAULT": thanosVersionStage,
"RECEIVE_ROUTER": thanosVersionStage,
"RECEIVE_INGESTOR_TELEMETER": thanosVersionStage,
"RECEIVE_INGESTOR_DEFAULT": thanosVersionStage,
"RULER": thanosVersionStage,
"COMPACT_DEFAULT": thanosVersionStage,
"COMPACT_TELEMETER": thanosVersionStage,
"QUERY": thanosVersionStage,
"QUERY_FRONTEND": thanosVersionStage,
apiCache: memcachedTag,
observatoriumAPI: "9aada65247a07782465beb500323a0e18d7e3d05",
}
Expand Down Expand Up @@ -341,13 +342,13 @@ var StageObjectStorageBucket = ParamMap[v1alpha1.ObjectStorageConfig]{

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

// ProductionVersions is a map of production versions.
var ProductionVersions = ParamMap[string]{
"STORE02W": currentThanosVersionProd,
"STORE2W90D": currentThanosVersionProd,
"STORE90D+": currentThanosVersionProd,
"STORE_DEFAULT": currentThanosVersionProd,
"QUERY": currentThanosVersionProd,
"QUERY_FRONTEND": currentThanosVersionProd,
"STORE02W": thanosVersionProd,
"STORE2W90D": thanosVersionProd,
"STORE90D+": thanosVersionProd,
"STORE_DEFAULT": thanosVersionProd,
"QUERY": thanosVersionProd,
"QUERY_FRONTEND": thanosVersionProd,
apiCache: memcachedTag,
observatoriumAPI: "9aada65247a07782465beb500323a0e18d7e3d05",
}
Expand All @@ -387,10 +388,10 @@ var ProductionStorageSize = ParamMap[v1alpha1.StorageSize]{

// ProductionReplicas is a map of production replicas.
var ProductionReplicas = ParamMap[int32]{
"STORE02W": 3,
"STORE02W": 2,
"STORE2W90D": 2,
"STORE90D+": 3,
"STORE_DEFAULT": 3,
"STORE90D+": 2,
"STORE_DEFAULT": 2,
"QUERY": 6,
"QUERY_FRONTEND": 3,
apiCache: 1,
Expand Down
2 changes: 1 addition & 1 deletion resources/services/bundle/production/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ objects:
- --zap-log-level=debug
command:
- /manager
image: quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:9a9d855a9b292274114239ca9859b19fc5c83322
image: quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-konflux-thanos-operator:2e19cebd4c056d661b2b0f6bd797bbe367e619fa
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
6 changes: 3 additions & 3 deletions resources/services/rhobs-thanos-operator/production/rhobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ objects:
key: thanos.yaml
name: observatorium-mst-thanos-objectstorage
optional: false
replicas: 3
replicas: 2
resourceRequirements:
requests:
cpu: 50m
Expand Down Expand Up @@ -389,7 +389,7 @@ objects:
key: thanos.yaml
name: thanos-objectstorage
optional: false
replicas: 3
replicas: 2
resourceRequirements:
requests:
cpu: 50m
Expand Down Expand Up @@ -578,7 +578,7 @@ objects:
key: thanos.yaml
name: thanos-objectstorage
optional: false
replicas: 3
replicas: 2
resourceRequirements:
requests:
cpu: 50m
Expand Down
Loading