Skip to content

Commit 627f50d

Browse files
authored
Add minReplicaCount, remove replicas if autoscaling is enabled (#1932)
* Add minReplicaCount and idleReplicaCount Add minReplicaCount and idleReplicaCount to browsers hpa.yaml files. And update doc * Fix doc * Remove idleReplicaCount * Remove replicas in case autoscaling is enabled * Update doc
1 parent 427bf91 commit 627f50d

File tree

8 files changed

+18
-3
lines changed

8 files changed

+18
-3
lines changed

charts/selenium-grid/README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ This table contains the configuration parameters of the chart and their default
106106
| `autoscaling.deregisterLifecycle` | See `values.yaml` | Lifecycle applied to pods of deployments controlled by KEDA. Makes the node deregister from selenium hub |
107107
| `chromeNode.enabled` | `true` | Enable chrome nodes |
108108
| `chromeNode.deploymentEnabled` | `true` | Enable creation of Deployment for chrome nodes |
109-
| `chromeNode.replicas` | `1` | Number of chrome nodes |
109+
| `chromeNode.replicas` | `1` | Number of chrome nodes. Disabled if autoscaling is enabled. |
110110
| `chromeNode.imageName` | `selenium/node-chrome` | Image of chrome nodes |
111111
| `chromeNode.imageTag` | `4.12.1-20230904` | Image of chrome nodes |
112112
| `chromeNode.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
@@ -139,9 +139,10 @@ This table contains the configuration parameters of the chart and their default
139139
| `chromeNode.hpa.browserName` | `chrome` | BrowserName from the capability |
140140
| `chromeNode.hpa.browserVersion` | `` | BrowserVersion from the capability |
141141
| `chromeNode.maxReplicaCount` | `8` | Max number of replicas that this browsernode can auto scale up to |
142+
| `chromeNode.minReplicaCount` | `1` | Min number of replicas that this browsernode has when jobs are running |
142143
| `firefoxNode.enabled` | `true` | Enable firefox nodes |
143144
| `firefoxNode.deploymentEnabled` | `true` | Enable creation of Deployment for firefox nodes |
144-
| `firefoxNode.replicas` | `1` | Number of firefox nodes |
145+
| `firefoxNode.replicas` | `1` | Number of firefox nodes. Disabled if autoscaling is enabled. |
145146
| `firefoxNode.imageName` | `selenium/node-firefox` | Image of firefox nodes |
146147
| `firefoxNode.imageTag` | `4.12.1-20230904` | Image of firefox nodes |
147148
| `firefoxNode.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
@@ -174,9 +175,10 @@ This table contains the configuration parameters of the chart and their default
174175
| `firefoxNode.hpa.browserName` | `firefox` | BrowserName from the capability |
175176
| `firefoxNode.hpa.browserVersion` | `` | BrowserVersion from the capability |
176177
| `firefoxNode.maxReplicaCount` | `8` | Max number of replicas that this browsernode can auto scale up to |
178+
| `firefoxNode.minReplicaCount` | `1` | Min number of replicas that this browsernode has when jobs are running |
177179
| `edgeNode.enabled` | `true` | Enable edge nodes |
178180
| `edgeNode.deploymentEnabled` | `true` | Enable creation of Deployment for edge nodes |
179-
| `edgeNode.replicas` | `1` | Number of edge nodes |
181+
| `edgeNode.replicas` | `1` | Number of edge nodes. Disabled if autoscaling is enabled. |
180182
| `edgeNode.imageName` | `selenium/node-edge` | Image of edge nodes |
181183
| `edgeNode.imageTag` | `4.12.1-20230904` | Image of edge nodes |
182184
| `edgeNode.imagePullPolicy` | `IfNotPresent` | Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images) |
@@ -209,6 +211,7 @@ This table contains the configuration parameters of the chart and their default
209211
| `edgeNode.hpa.browserName` | `edge` | BrowserName from the capability |
210212
| `edgeNode.hpa.browserVersion` | `` | BrowserVersion from the capability |
211213
| `edgeNode.maxReplicaCount` | `8` | Max number of replicas that this browsernode can auto scale up to |
214+
| `edgeNode.minReplicaCount` | `1` | Min number of replicas that this browsernode has when jobs are running |
212215
| `customLabels` | `{}` | Custom labels for k8s resources |
213216
| `customLabels` | `{}` | Custom labels for k8s resources |
214217

charts/selenium-grid/templates/chrome-node-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ metadata:
1515
{{- toYaml . | nindent 4 }}
1616
{{- end }}
1717
spec:
18+
{{- if and (not .Values.autoscaling.enabled) (not .Values.autoscaling.enableWithExistingKEDA) }}
1819
replicas: {{ .Values.chromeNode.replicas }}
20+
{{end}}
1921
selector:
2022
matchLabels:
2123
app: selenium-chrome-node

charts/selenium-grid/templates/chrome-node-hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metadata:
1212
deploymentName: {{ template "seleniumGrid.chromeNode.fullname" . }}
1313
spec:
1414
maxReplicaCount: {{ .Values.chromeNode.maxReplicaCount }}
15+
minReplicaCount: {{ .Values.chromeNode.minReplicaCount }}
1516
scaleTargetRef:
1617
name: {{ template "seleniumGrid.chromeNode.fullname" . }}
1718
triggers:

charts/selenium-grid/templates/edge-node-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ metadata:
1515
{{- toYaml . | nindent 4 }}
1616
{{- end }}
1717
spec:
18+
{{- if and (not .Values.autoscaling.enabled) (not .Values.autoscaling.enableWithExistingKEDA) }}
1819
replicas: {{ .Values.edgeNode.replicas }}
20+
{{end}}
1921
selector:
2022
matchLabels:
2123
app: selenium-edge-node

charts/selenium-grid/templates/edge-node-hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metadata:
1212
deploymentName: {{ template "seleniumGrid.edgeNode.fullname" . }}
1313
spec:
1414
maxReplicaCount: {{ .Values.edgeNode.maxReplicaCount }}
15+
minReplicaCount: {{ .Values.edgeNode.minReplicaCount }}
1516
scaleTargetRef:
1617
name: {{ template "seleniumGrid.edgeNode.fullname" . }}
1718
triggers:

charts/selenium-grid/templates/firefox-node-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ metadata:
1515
{{- toYaml . | nindent 4 }}
1616
{{- end }}
1717
spec:
18+
{{- if and (not .Values.autoscaling.enabled) (not .Values.autoscaling.enableWithExistingKEDA) }}
1819
replicas: {{ .Values.firefoxNode.replicas }}
20+
{{end}}
1921
selector:
2022
matchLabels:
2123
app: selenium-firefox-node

charts/selenium-grid/templates/firefox-node-hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metadata:
1212
deploymentName: {{ template "seleniumGrid.firefoxNode.fullname" . }}
1313
spec:
1414
maxReplicaCount: {{ .Values.firefoxNode.maxReplicaCount }}
15+
minReplicaCount: {{ .Values.firefoxNode.minReplicaCount }}
1516
scaleTargetRef:
1617
name: {{ template "seleniumGrid.firefoxNode.fullname" . }}
1718
triggers:

charts/selenium-grid/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ chromeNode:
472472
# claimName: my-pv-claim
473473

474474
maxReplicaCount: 8
475+
minReplicaCount: 1
475476
hpa:
476477
url: '{{ include "seleniumGrid.graphqlURL" . }}'
477478
browserName: chrome
@@ -587,6 +588,7 @@ firefoxNode:
587588
# persistentVolumeClaim:
588589
# claimName: my-pv-claim
589590
maxReplicaCount: 8
591+
minReplicaCount: 1
590592
hpa:
591593
url: '{{ include "seleniumGrid.graphqlURL" . }}'
592594
browserName: firefox
@@ -700,6 +702,7 @@ edgeNode:
700702
# persistentVolumeClaim:
701703
# claimName: my-pv-claim
702704
maxReplicaCount: 8
705+
minReplicaCount: 1
703706
hpa:
704707
url: '{{ include "seleniumGrid.graphqlURL" . }}'
705708
browserName: MicrosoftEdge

0 commit comments

Comments
 (0)