Skip to content

Commit

Permalink
Mixed CPU and Memory params, Safer to recreate than rollout
Browse files Browse the repository at this point in the history
  • Loading branch information
Toni Syvaenen committed Jan 24, 2019
1 parent da843c4 commit 122d56a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
4 changes: 2 additions & 2 deletions zalenium/.applier/group_vars/seed-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ namespace: zalenium
app_name: zalenium

app_params:
ZALENIUM_MEMORY_LIMIT: "1000m"
ZALENIUM_CPU_LIMIT: "2Gi"
ZALENIUM_MEMORY_LIMIT: "2Gi"
ZALENIUM_CPU_LIMIT: "1000m"
VIDEOS_STORAGE_SIZE: "10G"
SLAVE_CPU_REQUEST: "100m"
SLAVE_CPU_LIMIT: "1000m"
Expand Down
19 changes: 17 additions & 2 deletions zalenium/.openshift/templates/zalenium-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ objects:
name: zalenium
spec:
replicas: 1
strategy:
recreateParams:
timeoutSeconds: 600
type: Recreate
template:
metadata:
labels:
Expand Down Expand Up @@ -105,6 +109,9 @@ objects:
- name: CONTEXT_PATH
value: ${CONTEXT_PATH}
resources:
requests:
cpu: ${ZALENIUM_CPU_REQUEST}
memory: "${ZALENIUM_MEMORY_REQUEST}"
limits:
cpu: ${ZALENIUM_CPU_LIMIT}
memory: "${ZALENIUM_MEMORY_LIMIT}"
Expand Down Expand Up @@ -145,14 +152,22 @@ objects:
storage: ${VIDEOS_STORAGE_SIZE}

parameters:
- name: ZALENIUM_MEMORY_REQUEST
description: Min Memory for Zalenium Zalenium (Selenium Grid) master
required: true
value: "500Mi"
- name: ZALENIUM_CPU_REQUEST
description: Min CPU for Zalenium (Selenium Grid) master
required: true
value: "100m"
- name: ZALENIUM_MEMORY_LIMIT
description: Max Memory for Zalenium Zalenium (Selenium Grid) master
required: true
value: "1000m"
value: "2Gi"
- name: ZALENIUM_CPU_LIMIT
description: Max CPU for Zalenium (Selenium Grid) master
required: true
value: "2Gi"
value: "1000m"
- name: SLAVE_CPU_REQUEST
description: Minium CPU for Zalenium slaves
required: true
Expand Down

0 comments on commit 122d56a

Please sign in to comment.