Skip to content

Commit d901aa6

Browse files
committed
[k8s] Fix up //deploys/k8s:grid.apply so it works again
1 parent 24bc7f0 commit d901aa6

File tree

7 files changed

+92
-0
lines changed

7 files changed

+92
-0
lines changed

deploys/docker/BUILD.bazel

+12
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,18 @@ container_image(
134134
],
135135
)
136136

137+
container_image(
138+
name = "session-queue-image",
139+
base = ":grid-base",
140+
entrypoint = ENTRY_POINT + ["sessionqueuer"],
141+
ports = [
142+
"5559/tcp", # Web
143+
"4442/tcp", # ZeroMQ
144+
"4443/tcp",
145+
],
146+
)
147+
148+
137149
container_layer(
138150
name = "grid-binary",
139151
directory = "/opt/selenium/bin",

deploys/k8s/BUILD.bazel

+9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ k8s_objects(
88
# Ordered by nominal start order
99
":event-bus",
1010
":session-map",
11+
":session-queue",
1112
":distributor",
1213
":router",
1314
":chrome-node",
@@ -47,6 +48,14 @@ k8s_dev(
4748
template = "session-map.yaml",
4849
)
4950

51+
k8s_dev(
52+
name = "session-queue",
53+
images = {
54+
"selenium/session-queue:latest": "//deploys/docker:session-queue-image",
55+
},
56+
template = "session-queue.yaml",
57+
)
58+
5059
k8s_dev(
5160
name = "firefox-node",
5261
images = {

deploys/k8s/chrome-node.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ spec:
4444
value: "org.openqa.selenium.grid.node.k8s.OneShotNode"
4545
- name: NODE_GRID_URL
4646
value: "http://localhost:4444/"
47+
- name: NODE_REGISTER_CYCLE
48+
value: "10"
49+
- name: NODE_REGISTER_PERIOD
50+
value: "120"
4751
resources:
4852
limits:
4953
memory: "1Gi"

deploys/k8s/distributor.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ spec:
3131
value: "session-map"
3232
- name: SESSIONS_PORT
3333
value: "5556"
34+
- name: SESSIONQUEUER_HOSTNAME
35+
value: "session-queue"
36+
- name: SESSIONQUEUER_PORT
37+
value: "5559"
3438
resources:
3539
limits:
3640
memory: "512Mi"

deploys/k8s/firefox-node.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ spec:
4444
value: "org.openqa.selenium.grid.node.k8s.OneShotNode"
4545
- name: NODE_GRID_URL
4646
value: "http://localhost:4444/"
47+
- name: NODE_REGISTER_CYCLE
48+
value: "10"
49+
- name: NODE_REGISTER_PERIOD
50+
value: "120"
4751
resources:
4852
limits:
4953
memory: "1Gi"

deploys/k8s/router.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ spec:
2525
value: "session-map"
2626
- name: SESSIONS_PORT
2727
value: "5556"
28+
- name: SESSIONQUEUER_HOSTNAME
29+
value: "session-queue"
30+
- name: SESSIONQUEUER_PORT
31+
value: "5559"
2832
- name: DISTRIBUTOR_HOSTNAME
2933
value: "distributor"
3034
- name: DISTRIBUTOR_PORT

deploys/k8s/session-queue.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: session-queue
6+
labels:
7+
app: session-queue
8+
spec:
9+
replicas: 1
10+
selector:
11+
matchLabels:
12+
app: session-queue
13+
template:
14+
metadata:
15+
labels:
16+
app: session-queue
17+
spec:
18+
containers:
19+
- name: session-queue
20+
image: selenium/session-queue:latest
21+
ports:
22+
- containerPort: 5559
23+
env:
24+
- name: EVENTS_BIND
25+
value: "false"
26+
- name: EVENTS_PUBLISH
27+
value: "tcp://event-bus:4442"
28+
- name: EVENTS_SUBSCRIBE
29+
value: "tcp://event-bus:4443"
30+
resources:
31+
limits:
32+
memory: "512Mi"
33+
cpu: ".5"
34+
readinessProbe:
35+
httpGet:
36+
port: 5559
37+
path: "/readyz"
38+
initialDelaySeconds: 2
39+
periodSeconds: 60
40+
---
41+
apiVersion: v1
42+
kind: Service
43+
metadata:
44+
name: session-queue
45+
labels:
46+
run: session-queue
47+
spec:
48+
type: NodePort
49+
selector:
50+
app: session-queue
51+
ports:
52+
- port: 5559
53+
targetPort: 5559
54+
protocol: TCP
55+
name: web

0 commit comments

Comments
 (0)