1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00

*: Remove memory request from manifests

This commit is contained in:
Frederic Branczyk 2018-04-27 17:21:52 +01:00
parent 3a27eee3dc
commit 8a16ce4a31
No known key found for this signature in database
GPG key ID: 7741A52782A90069
6 changed files with 2 additions and 15 deletions
Documentation/user-guides
example
additional-scrape-configs
non-rbac
rbac/prometheus
user-guides/alerting
pkg/prometheus

View file

@ -121,9 +121,6 @@ spec:
serviceMonitorSelector:
matchLabels:
team: frontend
resources:
requests:
memory: 400Mi
ruleSelector:
matchLabels:
role: alert-rules

View file

@ -15,9 +15,6 @@ spec:
- namespace: default
name: alertmanager
port: web
resources:
requests:
memory: 400Mi
additionalScrapeConfigs:
name: additional-scrape-configs
key: prometheus-additional.yaml

View file

@ -14,6 +14,3 @@ spec:
- namespace: default
name: alertmanager
port: web
resources:
requests:
memory: 400Mi

View file

@ -15,6 +15,3 @@ spec:
- namespace: default
name: alertmanager
port: web
resources:
requests:
memory: 400Mi

View file

@ -12,9 +12,6 @@ spec:
serviceMonitorSelector:
matchLabels:
team: frontend
resources:
requests:
memory: 400Mi
ruleSelector:
matchLabels:
role: alert-rules

View file

@ -255,6 +255,7 @@ func TestDeterministicRuleFileHashing(t *testing.T) {
func TestMemoryRequestNotAdjustedWhenLimitLarger2Gi(t *testing.T) {
sset, err := makeStatefulSet(monitoringv1.Prometheus{
Spec: monitoringv1.PrometheusSpec{
Version: "v1.8.2",
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceMemory: resource.MustParse("3Gi"),
@ -281,6 +282,7 @@ func TestMemoryRequestNotAdjustedWhenLimitLarger2Gi(t *testing.T) {
func TestMemoryRequestAdjustedWhenOnlyLimitGiven(t *testing.T) {
sset, err := makeStatefulSet(monitoringv1.Prometheus{
Spec: monitoringv1.PrometheusSpec{
Version: "v1.8.2",
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceMemory: resource.MustParse("1Gi"),