Skip to content

Commit 7c715a3

Browse files
authored
Merge pull request #261 from yevgeny-shnaidman/yevgeny/worker-to-linux-nodes
Configuring the worker DS to target only "linux" nodes
2 parents fdfe4bd + 1eb4ef6 commit 7c715a3

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

internal/daemonset/testdata/test_worker_daemonset.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,17 @@ spec:
2626
- matchExpressions:
2727
- key: node-role.kubernetes.io/master
2828
operator: DoesNotExist
29+
- key: kubernetes.io/os
30+
operator: In
31+
values:
32+
- "linux"
2933
- matchExpressions:
3034
- key: node-role.kubernetes.io/node
3135
operator: Exists
36+
- key: kubernetes.io/os
37+
operator: In
38+
values:
39+
- "linux"
3240
containers:
3341
- args: []
3442
command:

internal/daemonset/worker.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ func getWorkerAffinity() *corev1.Affinity {
3434
Key: "node-role.kubernetes.io/master",
3535
Operator: "DoesNotExist",
3636
},
37+
{
38+
Key: "kubernetes.io/os",
39+
Operator: corev1.NodeSelectorOpIn,
40+
Values: []string{"linux"},
41+
},
3742
},
3843
},
3944
{
@@ -42,6 +47,11 @@ func getWorkerAffinity() *corev1.Affinity {
4247
Key: "node-role.kubernetes.io/node",
4348
Operator: "Exists",
4449
},
50+
{
51+
Key: "kubernetes.io/os",
52+
Operator: corev1.NodeSelectorOpIn,
53+
Values: []string{"linux"},
54+
},
4555
},
4656
},
4757
},

0 commit comments

Comments
 (0)