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

Adds missing images in generated prod conf #780

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Adds missing images in generated prod conf #780

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
8 changes: 7 additions & 1 deletion magefiles/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,16 @@ var StageObjectStorageBucket = ParamMap[v1alpha1.ObjectStorageConfig]{
var ProductionImages = ParamMap[string]{
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorStage,
"KUBE_RBAC_PROXY": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:98455d503b797b6b02edcfd37045c8fab0796b95ee5cf4cfe73b221a07e805f0",
apiCache: memcachedImage,
memcachedExporter: memcachedExporterImage,
observatoriumAPI: "quay.io/redhat-user-workloads/rhobs-mco-tenant/observatorium-api:9aada65247a07782465beb500323a0e18d7e3d05",
}

// ProductionVersions is a map of production versions.
var ProductionVersions = ParamMap[string]{}
var ProductionVersions = ParamMap[string]{
apiCache: memcachedTag,
observatoriumAPI: "9aada65247a07782465beb500323a0e18d7e3d05",
}

// ProductionLogLevels is a map of production log levels.
var ProductionLogLevels = ParamMap[string]{}
Expand Down
14 changes: 8 additions & 6 deletions resources/services/memcached/production/memcached-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
name: api-memcached
namespace: rhobs-production
spec:
Expand All @@ -32,7 +32,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
status:
loadBalancer: {}
- apiVersion: v1
Expand All @@ -44,7 +44,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
name: api-memcached
namespace: rhobs-production
- apiVersion: apps/v1
Expand All @@ -56,7 +56,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
name: api-memcached
namespace: rhobs-production
spec:
Expand All @@ -68,7 +68,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
serviceName: api-memcached
template:
metadata:
Expand All @@ -78,14 +78,15 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
spec:
containers:
- args:
- -m 2048
- -c 3072
- -I 5m
- -v
image: registry.redhat.io/rhel8/memcached:1.5-316
imagePullPolicy: IfNotPresent
name: memcached
ports:
Expand All @@ -97,6 +98,7 @@ objects:
- args:
- --memcached.address=localhost:11211
- --web.listen-address=0.0.0.0:9150
image: quay.io/prometheus/memcached-exporter:v0.15.0
imagePullPolicy: IfNotPresent
name: exporter
ports:
Expand Down
4 changes: 2 additions & 2 deletions resources/services/memcached/production/service-monitor-memcached-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
prometheus: app-sre
name: api-memcached
namespace: openshift-customer-monitoring
Expand All @@ -32,4 +32,4 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: memcached
app.kubernetes.io/part-of: observatorium
app.kubernetes.io/version: ""
app.kubernetes.io/version: 1.5-316
2 changes: 1 addition & 1 deletion resources/services/observatorium-api/production/observatorium-api-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ objects:
app.kubernetes.io/instance: rhobs
app.kubernetes.io/name: observatorium-api
app.kubernetes.io/part-of: rhobs
app.kubernetes.io/version: ""
app.kubernetes.io/version: 9aada65247a07782465beb500323a0e18d7e3d05
name: observatorium-api
namespace: rhobs-production
stringData:
Expand Down