Skip to content

Commit 4564b26

Browse files
JamesMBartlettJamesMBartlett
authored
Add architecture tolerations to bundleUnpacker job (#2958)
Signed-off-by: James Bartlett <[email protected]>
1 parent f8b1721 commit 4564b26

File tree

2 files changed

+154
-0
lines changed

2 files changed

+154
-0
lines changed

‎pkg/controller/bundle/bundle_unpacker.go

+22
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,28 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
211211
NodeSelector: map[string]string{
212212
"kubernetes.io/os": "linux",
213213
},
214+
Tolerations: []corev1.Toleration{
215+
{
216+
Key: "kubernetes.io/arch",
217+
Value: "amd64",
218+
Operator: "Equal",
219+
},
220+
{
221+
Key: "kubernetes.io/arch",
222+
Value: "arm64",
223+
Operator: "Equal",
224+
},
225+
{
226+
Key: "kubernetes.io/arch",
227+
Value: "ppc64le",
228+
Operator: "Equal",
229+
},
230+
{
231+
Key: "kubernetes.io/arch",
232+
Value: "s390x",
233+
Operator: "Equal",
234+
},
235+
},
214236
},
215237
},
216238
},

‎pkg/controller/bundle/bundle_unpacker_test.go

+132
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,28 @@ func TestConfigMapUnpacker(t *testing.T) {
337337
NodeSelector: map[string]string{
338338
"kubernetes.io/os": "linux",
339339
},
340+
Tolerations: []corev1.Toleration{
341+
{
342+
Key: "kubernetes.io/arch",
343+
Value: "amd64",
344+
Operator: "Equal",
345+
},
346+
{
347+
Key: "kubernetes.io/arch",
348+
Value: "arm64",
349+
Operator: "Equal",
350+
},
351+
{
352+
Key: "kubernetes.io/arch",
353+
Value: "ppc64le",
354+
Operator: "Equal",
355+
},
356+
{
357+
Key: "kubernetes.io/arch",
358+
Value: "s390x",
359+
Operator: "Equal",
360+
},
361+
},
340362
},
341363
},
342364
},
@@ -542,6 +564,28 @@ func TestConfigMapUnpacker(t *testing.T) {
542564
NodeSelector: map[string]string{
543565
"kubernetes.io/os": "linux",
544566
},
567+
Tolerations: []corev1.Toleration{
568+
{
569+
Key: "kubernetes.io/arch",
570+
Value: "amd64",
571+
Operator: "Equal",
572+
},
573+
{
574+
Key: "kubernetes.io/arch",
575+
Value: "arm64",
576+
Operator: "Equal",
577+
},
578+
{
579+
Key: "kubernetes.io/arch",
580+
Value: "ppc64le",
581+
Operator: "Equal",
582+
},
583+
{
584+
Key: "kubernetes.io/arch",
585+
Value: "s390x",
586+
Operator: "Equal",
587+
},
588+
},
545589
},
546590
},
547591
},
@@ -788,6 +832,28 @@ func TestConfigMapUnpacker(t *testing.T) {
788832
NodeSelector: map[string]string{
789833
"kubernetes.io/os": "linux",
790834
},
835+
Tolerations: []corev1.Toleration{
836+
{
837+
Key: "kubernetes.io/arch",
838+
Value: "amd64",
839+
Operator: "Equal",
840+
},
841+
{
842+
Key: "kubernetes.io/arch",
843+
Value: "arm64",
844+
Operator: "Equal",
845+
},
846+
{
847+
Key: "kubernetes.io/arch",
848+
Value: "ppc64le",
849+
Operator: "Equal",
850+
},
851+
{
852+
Key: "kubernetes.io/arch",
853+
Value: "s390x",
854+
Operator: "Equal",
855+
},
856+
},
791857
},
792858
},
793859
},
@@ -1028,6 +1094,28 @@ func TestConfigMapUnpacker(t *testing.T) {
10281094
NodeSelector: map[string]string{
10291095
"kubernetes.io/os": "linux",
10301096
},
1097+
Tolerations: []corev1.Toleration{
1098+
{
1099+
Key: "kubernetes.io/arch",
1100+
Value: "amd64",
1101+
Operator: "Equal",
1102+
},
1103+
{
1104+
Key: "kubernetes.io/arch",
1105+
Value: "arm64",
1106+
Operator: "Equal",
1107+
},
1108+
{
1109+
Key: "kubernetes.io/arch",
1110+
Value: "ppc64le",
1111+
Operator: "Equal",
1112+
},
1113+
{
1114+
Key: "kubernetes.io/arch",
1115+
Value: "s390x",
1116+
Operator: "Equal",
1117+
},
1118+
},
10311119
},
10321120
},
10331121
},
@@ -1238,6 +1326,28 @@ func TestConfigMapUnpacker(t *testing.T) {
12381326
NodeSelector: map[string]string{
12391327
"kubernetes.io/os": "linux",
12401328
},
1329+
Tolerations: []corev1.Toleration{
1330+
{
1331+
Key: "kubernetes.io/arch",
1332+
Value: "amd64",
1333+
Operator: "Equal",
1334+
},
1335+
{
1336+
Key: "kubernetes.io/arch",
1337+
Value: "arm64",
1338+
Operator: "Equal",
1339+
},
1340+
{
1341+
Key: "kubernetes.io/arch",
1342+
Value: "ppc64le",
1343+
Operator: "Equal",
1344+
},
1345+
{
1346+
Key: "kubernetes.io/arch",
1347+
Value: "s390x",
1348+
Operator: "Equal",
1349+
},
1350+
},
12411351
},
12421352
},
12431353
},
@@ -1459,6 +1569,28 @@ func TestConfigMapUnpacker(t *testing.T) {
14591569
NodeSelector: map[string]string{
14601570
"kubernetes.io/os": "linux",
14611571
},
1572+
Tolerations: []corev1.Toleration{
1573+
{
1574+
Key: "kubernetes.io/arch",
1575+
Value: "amd64",
1576+
Operator: "Equal",
1577+
},
1578+
{
1579+
Key: "kubernetes.io/arch",
1580+
Value: "arm64",
1581+
Operator: "Equal",
1582+
},
1583+
{
1584+
Key: "kubernetes.io/arch",
1585+
Value: "ppc64le",
1586+
Operator: "Equal",
1587+
},
1588+
{
1589+
Key: "kubernetes.io/arch",
1590+
Value: "s390x",
1591+
Operator: "Equal",
1592+
},
1593+
},
14621594
},
14631595
},
14641596
},

0 commit comments

Comments
 (0)