Skip to content

Commit

Permalink
🔀 Merge branch 'RHMAP-21646'
Browse files Browse the repository at this point in the history
  • Loading branch information
grdryn committed Sep 24, 2018
2 parents 09ce5c3 + 7a1ac21 commit 12e4e88
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
38 changes: 19 additions & 19 deletions fh-mbaas-components.json
Original file line number Diff line number Diff line change
Expand Up @@ -1078,25 +1078,25 @@
{
"name": "FH_MBAAS_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "1m",
"value": "200m",
"required": true
},
{
"name": "FH_MBAAS_CPU_LIMIT",
"description": "Maximum amount of CPU the container can use.",
"value": "200m",
"value": "800m",
"required": true
},
{
"name": "FH_MBAAS_MEMORY_REQUEST",
"description": "Minimum amount of memory the container can use.",
"value": "130Mi",
"value": "200Mi",
"required": true
},
{
"name": "FH_MBAAS_MEMORY_LIMIT",
"description": "Maximum amount of memory the container can use.",
"value": "250Mi",
"value": "800Mi",
"required": true
},
{
Expand All @@ -1112,25 +1112,25 @@
{
"name": "FH_MESSAGING_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "1m",
"value": "200m",
"required": true
},
{
"name": "FH_MESSAGING_CPU_LIMIT",
"description": "Maximum amount of CPU the container can use.",
"value": "200m",
"value": "400m",
"required": true
},
{
"name": "FH_MESSAGING_MEMORY_REQUEST",
"description": "Minimum amount of memory the container can use.",
"value": "50Mi",
"value": "200Mi",
"required": true
},
{
"name": "FH_MESSAGING_MEMORY_LIMIT",
"description": "Maximum amount of memory the container can use.",
"value": "100Mi",
"value": "400Mi",
"required": true
},
{
Expand All @@ -1146,25 +1146,25 @@
{
"name": "FH_METRICS_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "1m",
"value": "200m",
"required": true
},
{
"name": "FH_METRICS_CPU_LIMIT",
"description": "Maximum amount of CPU the container can use.",
"value": "200m",
"value": "400m",
"required": true
},
{
"name": "FH_METRICS_MEMORY_REQUEST",
"description": "Minimum amount of memory the container can use.",
"value": "40Mi",
"value": "400Mi",
"required": true
},
{
"name": "FH_METRICS_MEMORY_LIMIT",
"description": "Maximum amount of memory the container can use.",
"value": "100Mi",
"value": "400Mi",
"required": true
},
{
Expand All @@ -1180,25 +1180,25 @@
{
"name": "FH_STATSD_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "1m",
"value": "200m",
"required": true
},
{
"name": "FH_STATSD_CPU_LIMIT",
"description": "Maximum amount of CPU the container can use.",
"value": "200m",
"value": "400m",
"required": true
},
{
"name": "FH_STATSD_MEMORY_REQUEST",
"description": "Minimum amount of memory the container can use.",
"value": "25Mi",
"value": "200Mi",
"required": true
},
{
"name": "FH_STATSD_MEMORY_LIMIT",
"description": "Maximum amount of memory the container can use.",
"value": "50Mi",
"value": "400Mi",
"required": true
},
{
Expand Down Expand Up @@ -1313,7 +1313,7 @@
{
"name": "NAGIOS_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "1m",
"value": "200m",
"required": true
},
{
Expand All @@ -1325,13 +1325,13 @@
{
"name": "NAGIOS_MEMORY_REQUEST",
"description": "Minimum amount of memory the container can use.",
"value": "35Mi",
"value": "200Mi",
"required": true
},
{
"name": "NAGIOS_MEMORY_LIMIT",
"description": "Maximum amount of memory the container can use.",
"value": "150Mi",
"value": "800Mi",
"required": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion mongo-replica-affinity.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
{
"name": "MONGODB_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "5m",
"value": "200m",
"required": true
},
{
Expand Down
2 changes: 1 addition & 1 deletion mongo-replica.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
{
"name": "MONGODB_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "5m",
"value": "200m",
"required": true
},
{
Expand Down
2 changes: 1 addition & 1 deletion mongo-standalone-ephemeral.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
{
"name": "MONGODB_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "5m",
"value": "200m",
"required": true
},
{
Expand Down
4 changes: 2 additions & 2 deletions mongo-standalone.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"cpu": "${MONGODB_CPU_REQUEST}",
"memory": "${MONGODB_MEMORY_REQUEST}"
}
},
},
"livenessProbe": {
"failureThreshold": 2,
"initialDelaySeconds": 5,
Expand Down Expand Up @@ -253,7 +253,7 @@
{
"name": "MONGODB_CPU_REQUEST",
"description": "Minimum amount of CPU the container can use.",
"value": "5m",
"value": "200m",
"required": true
},
{
Expand Down

0 comments on commit 12e4e88

Please sign in to comment.