Skip to content

Commit 51af1bc

Browse files
JamesMBartlettJamesMBartlett
committed
Add architecture tolerations to bundleUnpacker job
Signed-off-by: James Bartlett <[email protected]>
1 parent c24d256 commit 51af1bc

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
@@ -214,6 +214,28 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
214214
NodeSelector: map[string]string{
215215
"kubernetes.io/os": "linux",
216216
},
217+
Tolerations: []corev1.Toleration{
218+
{
219+
Key: "kubernetes.io/arch",
220+
Value: "amd64",
221+
Operator: "Equal",
222+
},
223+
{
224+
Key: "kubernetes.io/arch",
225+
Value: "arm64",
226+
Operator: "Equal",
227+
},
228+
{
229+
Key: "kubernetes.io/arch",
230+
Value: "ppc64le",
231+
Operator: "Equal",
232+
},
233+
{
234+
Key: "kubernetes.io/arch",
235+
Value: "s390x",
236+
Operator: "Equal",
237+
},
238+
},
217239
},
218240
},
219241
},

‎pkg/controller/bundle/bundle_unpacker_test.go

+132
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,28 @@ func TestConfigMapUnpacker(t *testing.T) {
332332
NodeSelector: map[string]string{
333333
"kubernetes.io/os": "linux",
334334
},
335+
Tolerations: []corev1.Toleration{
336+
{
337+
Key: "kubernetes.io/arch",
338+
Value: "amd64",
339+
Operator: "Equal",
340+
},
341+
{
342+
Key: "kubernetes.io/arch",
343+
Value: "arm64",
344+
Operator: "Equal",
345+
},
346+
{
347+
Key: "kubernetes.io/arch",
348+
Value: "ppc64le",
349+
Operator: "Equal",
350+
},
351+
{
352+
Key: "kubernetes.io/arch",
353+
Value: "s390x",
354+
Operator: "Equal",
355+
},
356+
},
335357
},
336358
},
337359
},
@@ -537,6 +559,28 @@ func TestConfigMapUnpacker(t *testing.T) {
537559
NodeSelector: map[string]string{
538560
"kubernetes.io/os": "linux",
539561
},
562+
Tolerations: []corev1.Toleration{
563+
{
564+
Key: "kubernetes.io/arch",
565+
Value: "amd64",
566+
Operator: "Equal",
567+
},
568+
{
569+
Key: "kubernetes.io/arch",
570+
Value: "arm64",
571+
Operator: "Equal",
572+
},
573+
{
574+
Key: "kubernetes.io/arch",
575+
Value: "ppc64le",
576+
Operator: "Equal",
577+
},
578+
{
579+
Key: "kubernetes.io/arch",
580+
Value: "s390x",
581+
Operator: "Equal",
582+
},
583+
},
540584
},
541585
},
542586
},
@@ -783,6 +827,28 @@ func TestConfigMapUnpacker(t *testing.T) {
783827
NodeSelector: map[string]string{
784828
"kubernetes.io/os": "linux",
785829
},
830+
Tolerations: []corev1.Toleration{
831+
{
832+
Key: "kubernetes.io/arch",
833+
Value: "amd64",
834+
Operator: "Equal",
835+
},
836+
{
837+
Key: "kubernetes.io/arch",
838+
Value: "arm64",
839+
Operator: "Equal",
840+
},
841+
{
842+
Key: "kubernetes.io/arch",
843+
Value: "ppc64le",
844+
Operator: "Equal",
845+
},
846+
{
847+
Key: "kubernetes.io/arch",
848+
Value: "s390x",
849+
Operator: "Equal",
850+
},
851+
},
786852
},
787853
},
788854
},
@@ -1023,6 +1089,28 @@ func TestConfigMapUnpacker(t *testing.T) {
10231089
NodeSelector: map[string]string{
10241090
"kubernetes.io/os": "linux",
10251091
},
1092+
Tolerations: []corev1.Toleration{
1093+
{
1094+
Key: "kubernetes.io/arch",
1095+
Value: "amd64",
1096+
Operator: "Equal",
1097+
},
1098+
{
1099+
Key: "kubernetes.io/arch",
1100+
Value: "arm64",
1101+
Operator: "Equal",
1102+
},
1103+
{
1104+
Key: "kubernetes.io/arch",
1105+
Value: "ppc64le",
1106+
Operator: "Equal",
1107+
},
1108+
{
1109+
Key: "kubernetes.io/arch",
1110+
Value: "s390x",
1111+
Operator: "Equal",
1112+
},
1113+
},
10261114
},
10271115
},
10281116
},
@@ -1233,6 +1321,28 @@ func TestConfigMapUnpacker(t *testing.T) {
12331321
NodeSelector: map[string]string{
12341322
"kubernetes.io/os": "linux",
12351323
},
1324+
Tolerations: []corev1.Toleration{
1325+
{
1326+
Key: "kubernetes.io/arch",
1327+
Value: "amd64",
1328+
Operator: "Equal",
1329+
},
1330+
{
1331+
Key: "kubernetes.io/arch",
1332+
Value: "arm64",
1333+
Operator: "Equal",
1334+
},
1335+
{
1336+
Key: "kubernetes.io/arch",
1337+
Value: "ppc64le",
1338+
Operator: "Equal",
1339+
},
1340+
{
1341+
Key: "kubernetes.io/arch",
1342+
Value: "s390x",
1343+
Operator: "Equal",
1344+
},
1345+
},
12361346
},
12371347
},
12381348
},
@@ -1454,6 +1564,28 @@ func TestConfigMapUnpacker(t *testing.T) {
14541564
NodeSelector: map[string]string{
14551565
"kubernetes.io/os": "linux",
14561566
},
1567+
Tolerations: []corev1.Toleration{
1568+
{
1569+
Key: "kubernetes.io/arch",
1570+
Value: "amd64",
1571+
Operator: "Equal",
1572+
},
1573+
{
1574+
Key: "kubernetes.io/arch",
1575+
Value: "arm64",
1576+
Operator: "Equal",
1577+
},
1578+
{
1579+
Key: "kubernetes.io/arch",
1580+
Value: "ppc64le",
1581+
Operator: "Equal",
1582+
},
1583+
{
1584+
Key: "kubernetes.io/arch",
1585+
Value: "s390x",
1586+
Operator: "Equal",
1587+
},
1588+
},
14571589
},
14581590
},
14591591
},

0 commit comments

Comments
 (0)