diff --git a/magefiles/template.go b/magefiles/template.go index 0a435a60c7..ef0dfbc1ab 100644 --- a/magefiles/template.go +++ b/magefiles/template.go @@ -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]{} diff --git a/resources/services/memcached/production/memcached-template.yaml b/resources/services/memcached/production/memcached-template.yaml index 6da665c492..52751fb5b3 100755 --- a/resources/services/memcached/production/memcached-template.yaml +++ b/resources/services/memcached/production/memcached-template.yaml @@ -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: @@ -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 @@ -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 @@ -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: @@ -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: @@ -78,7 +78,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 spec: containers: - args: @@ -86,6 +86,7 @@ objects: - -c 3072 - -I 5m - -v + image: registry.redhat.io/rhel8/memcached:1.5-316 imagePullPolicy: IfNotPresent name: memcached ports: @@ -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: diff --git a/resources/services/memcached/production/service-monitor-memcached-template.yaml b/resources/services/memcached/production/service-monitor-memcached-template.yaml index fc6722e4a7..8dc5af1966 100755 --- a/resources/services/memcached/production/service-monitor-memcached-template.yaml +++ b/resources/services/memcached/production/service-monitor-memcached-template.yaml @@ -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 @@ -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 diff --git a/resources/services/observatorium-api/production/observatorium-api-template.yaml b/resources/services/observatorium-api/production/observatorium-api-template.yaml index 6b83ac96ea..c7b690d3da 100755 --- a/resources/services/observatorium-api/production/observatorium-api-template.yaml +++ b/resources/services/observatorium-api/production/observatorium-api-template.yaml @@ -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: