Skip to content

Commit 544ee3a

Browse files
authored
Adds missing images in generated prod conf (#780)
1 parent 4502f0a commit 544ee3a

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

magefiles/template.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,16 @@ var StageObjectStorageBucket = ParamMap[v1alpha1.ObjectStorageConfig]{
342342
var ProductionImages = ParamMap[string]{
343343
"THANOS_OPERATOR": "quay.io/redhat-user-workloads/rhobs-mco-tenant/rhobs-thanos-operator:" + thanosOperatorStage,
344344
"KUBE_RBAC_PROXY": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:98455d503b797b6b02edcfd37045c8fab0796b95ee5cf4cfe73b221a07e805f0",
345+
apiCache: memcachedImage,
346+
memcachedExporter: memcachedExporterImage,
347+
observatoriumAPI: "quay.io/redhat-user-workloads/rhobs-mco-tenant/observatorium-api:9aada65247a07782465beb500323a0e18d7e3d05",
345348
}
346349

347350
// ProductionVersions is a map of production versions.
348-
var ProductionVersions = ParamMap[string]{}
351+
var ProductionVersions = ParamMap[string]{
352+
apiCache: memcachedTag,
353+
observatoriumAPI: "9aada65247a07782465beb500323a0e18d7e3d05",
354+
}
349355

350356
// ProductionLogLevels is a map of production log levels.
351357
var ProductionLogLevels = ParamMap[string]{}

resources/services/memcached/production/memcached-template.yaml

+8-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ objects:
1313
app.kubernetes.io/instance: rhobs
1414
app.kubernetes.io/name: memcached
1515
app.kubernetes.io/part-of: observatorium
16-
app.kubernetes.io/version: ""
16+
app.kubernetes.io/version: 1.5-316
1717
name: api-memcached
1818
namespace: rhobs-production
1919
spec:
@@ -32,7 +32,7 @@ objects:
3232
app.kubernetes.io/instance: rhobs
3333
app.kubernetes.io/name: memcached
3434
app.kubernetes.io/part-of: observatorium
35-
app.kubernetes.io/version: ""
35+
app.kubernetes.io/version: 1.5-316
3636
status:
3737
loadBalancer: {}
3838
- apiVersion: v1
@@ -44,7 +44,7 @@ objects:
4444
app.kubernetes.io/instance: rhobs
4545
app.kubernetes.io/name: memcached
4646
app.kubernetes.io/part-of: observatorium
47-
app.kubernetes.io/version: ""
47+
app.kubernetes.io/version: 1.5-316
4848
name: api-memcached
4949
namespace: rhobs-production
5050
- apiVersion: apps/v1
@@ -56,7 +56,7 @@ objects:
5656
app.kubernetes.io/instance: rhobs
5757
app.kubernetes.io/name: memcached
5858
app.kubernetes.io/part-of: observatorium
59-
app.kubernetes.io/version: ""
59+
app.kubernetes.io/version: 1.5-316
6060
name: api-memcached
6161
namespace: rhobs-production
6262
spec:
@@ -68,7 +68,7 @@ objects:
6868
app.kubernetes.io/instance: rhobs
6969
app.kubernetes.io/name: memcached
7070
app.kubernetes.io/part-of: observatorium
71-
app.kubernetes.io/version: ""
71+
app.kubernetes.io/version: 1.5-316
7272
serviceName: api-memcached
7373
template:
7474
metadata:
@@ -78,14 +78,15 @@ objects:
7878
app.kubernetes.io/instance: rhobs
7979
app.kubernetes.io/name: memcached
8080
app.kubernetes.io/part-of: observatorium
81-
app.kubernetes.io/version: ""
81+
app.kubernetes.io/version: 1.5-316
8282
spec:
8383
containers:
8484
- args:
8585
- -m 2048
8686
- -c 3072
8787
- -I 5m
8888
- -v
89+
image: registry.redhat.io/rhel8/memcached:1.5-316
8990
imagePullPolicy: IfNotPresent
9091
name: memcached
9192
ports:
@@ -97,6 +98,7 @@ objects:
9798
- args:
9899
- --memcached.address=localhost:11211
99100
- --web.listen-address=0.0.0.0:9150
101+
image: quay.io/prometheus/memcached-exporter:v0.15.0
100102
imagePullPolicy: IfNotPresent
101103
name: exporter
102104
ports:

resources/services/memcached/production/service-monitor-memcached-template.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ objects:
1313
app.kubernetes.io/instance: rhobs
1414
app.kubernetes.io/name: memcached
1515
app.kubernetes.io/part-of: observatorium
16-
app.kubernetes.io/version: ""
16+
app.kubernetes.io/version: 1.5-316
1717
prometheus: app-sre
1818
name: api-memcached
1919
namespace: openshift-customer-monitoring
@@ -32,4 +32,4 @@ objects:
3232
app.kubernetes.io/instance: rhobs
3333
app.kubernetes.io/name: memcached
3434
app.kubernetes.io/part-of: observatorium
35-
app.kubernetes.io/version: ""
35+
app.kubernetes.io/version: 1.5-316

resources/services/observatorium-api/production/observatorium-api-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ objects:
563563
app.kubernetes.io/instance: rhobs
564564
app.kubernetes.io/name: observatorium-api
565565
app.kubernetes.io/part-of: rhobs
566-
app.kubernetes.io/version: ""
566+
app.kubernetes.io/version: 9aada65247a07782465beb500323a0e18d7e3d05
567567
name: observatorium-api
568568
namespace: rhobs-production
569569
stringData:

0 commit comments

Comments
 (0)