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

[rhobs]: fix store and compactor deployment #636

Merged
merged 1 commit into from
Nov 6, 2023
Merged

[rhobs]: fix store and compactor deployment #636

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
6 changes: 3 additions & 3 deletions ...p-sre-stage-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ parameters:
- name: REPLICAS
value: "1"
- name: CPU_REQUEST
value: "15"
value: "2"
- name: MEMORY_LIMIT
value: 200Gi
value: 24Gi
- name: MEMORY_REQUEST
value: 200Gi
value: 24Gi
4 changes: 2 additions & 2 deletions ...services/app-sre-stage-01/rhobs/default/observatorium-metrics-store-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ objects:
name: hashmod-config
- configMap:
defaultMode: 511
name: thanos-store
name: hashmod-config-template-default
name: hashmod-config-template-default
name: hashmod-config-template
updateStrategy: {}
volumeClaimTemplates:
- metadata:
Expand Down
6 changes: 3 additions & 3 deletions ...ces/app-sre-stage-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ parameters:
- name: REPLICAS
value: "1"
- name: CPU_REQUEST
value: "15"
value: "2"
- name: MEMORY_LIMIT
value: 200Gi
value: 24Gi
- name: MEMORY_REQUEST
value: 200Gi
value: 24Gi
4 changes: 2 additions & 2 deletions ...urces/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ objects:
name: hashmod-config
- configMap:
defaultMode: 511
name: thanos-store
name: hashmod-config-template-rhel
name: hashmod-config-template-rhel
name: hashmod-config-template
updateStrategy: {}
volumeClaimTemplates:
- metadata:
Expand Down
6 changes: 3 additions & 3 deletions ...e-stage-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ parameters:
- name: REPLICAS
value: "1"
- name: CPU_REQUEST
value: "15"
value: "2"
- name: MEMORY_LIMIT
value: 200Gi
value: 24Gi
- name: MEMORY_REQUEST
value: 200Gi
value: 24Gi
4 changes: 2 additions & 2 deletions ...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ objects:
name: hashmod-config
- configMap:
defaultMode: 511
name: thanos-store
name: hashmod-config-template-telemeter
name: hashmod-config-template-telemeter
name: hashmod-config-template
updateStrategy: {}
volumeClaimTemplates:
- metadata:
Expand Down
6 changes: 3 additions & 3 deletions ...emeter-prod-01/rhobs/default/observatorium-metrics-receive-ingestor-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ parameters:
- name: REPLICAS
value: "1"
- name: CPU_REQUEST
value: "15"
value: "2"
- name: MEMORY_LIMIT
value: 200Gi
value: 24Gi
- name: MEMORY_REQUEST
value: 200Gi
value: 24Gi
4 changes: 2 additions & 2 deletions ...ervices/telemeter-prod-01/rhobs/default/observatorium-metrics-store-default-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ objects:
name: hashmod-config
- configMap:
defaultMode: 511
name: thanos-store
name: hashmod-config-template-default
name: hashmod-config-template-default
name: hashmod-config-template
updateStrategy: {}
volumeClaimTemplates:
- metadata:
Expand Down
6 changes: 3 additions & 3 deletions ...es/telemeter-prod-01/rhobs/rhel/observatorium-metrics-receive-ingestor-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ parameters:
- name: REPLICAS
value: "1"
- name: CPU_REQUEST
value: "15"
value: "2"
- name: MEMORY_LIMIT
value: 200Gi
value: 24Gi
- name: MEMORY_REQUEST
value: 200Gi
value: 24Gi
4 changes: 2 additions & 2 deletions ...rces/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-store-rhel-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ objects:
name: hashmod-config
- configMap:
defaultMode: 511
name: thanos-store
name: hashmod-config-template-rhel
name: hashmod-config-template-rhel
name: hashmod-config-template
updateStrategy: {}
volumeClaimTemplates:
- metadata:
Expand Down
6 changes: 3 additions & 3 deletions ...er-prod-01/rhobs/telemeter/observatorium-metrics-receive-ingestor-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ parameters:
- name: REPLICAS
value: "1"
- name: CPU_REQUEST
value: "15"
value: "2"
- name: MEMORY_LIMIT
value: 200Gi
value: 24Gi
- name: MEMORY_REQUEST
value: 200Gi
value: 24Gi
4 changes: 2 additions & 2 deletions ...ces/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-store-telemeter-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ objects:
name: hashmod-config
- configMap:
defaultMode: 511
name: thanos-store
name: hashmod-config-template-telemeter
name: hashmod-config-template-telemeter
name: hashmod-config-template
updateStrategy: {}
volumeClaimTemplates:
- metadata:
Expand Down
10 changes: 5 additions & 5 deletions services_go/observatorium/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ func (o ObservatoriumMetrics) makeTenantReceiveIngestor(instanceCfg *Observatori
ingestor.VolumeType = "gp2"
ingestor.VolumeSize = "50Gi"
delete(ingestor.PodResources.Limits, corev1.ResourceCPU)
ingestor.PodResources.Requests[corev1.ResourceCPU] = resource.MustParse("15")
ingestor.PodResources.Requests[corev1.ResourceMemory] = resource.MustParse("200Gi")
ingestor.PodResources.Limits[corev1.ResourceMemory] = resource.MustParse("200Gi")
ingestor.PodResources.Requests[corev1.ResourceCPU] = resource.MustParse("2")
ingestor.PodResources.Requests[corev1.ResourceMemory] = resource.MustParse("24Gi")
ingestor.PodResources.Limits[corev1.ResourceMemory] = resource.MustParse("24Gi")
ingestor.Env = deleteObjStoreEnv(ingestor.Env) // delete the default objstore env vars
ingestor.Env = append(ingestor.Env, objStoreEnvVars(instanceCfg.ObjStoreSecret)...)
ingestor.Sidecars = []k8sutil.ContainerProvider{makeJaegerAgent("observatorium-tools")}
Expand Down Expand Up @@ -530,11 +530,11 @@ func (o ObservatoriumMetrics) makeStore(instanceCfg *ObservatoriumMetricsInstanc
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
}, corev1.Volume{
Name: hasmodCMName,
Name: "hashmod-config-template",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: storeStatefulSet.CommonLabels[k8sutil.NameLabel],
Name: hasmodCMName,
},
DefaultMode: &defaultMode,
},
Expand Down
Loading