add catalog-operator control-plane-specific tolerations to unpack jobs

Signed-off-by: grokspawn <[email protected]>

Author: grokspawn

pkg/controller/bundle/bundle_unpacker.go

@@ -234,6 +234,7 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 						"kubernetes.io/os": "linux",
 					},
 					Tolerations: []corev1.Toleration{
+						// arch-specific tolerations
 						{
 							Key:      "kubernetes.io/arch",
 							Value:    "amd64",
@@ -254,6 +255,24 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 							Value:    "s390x",
 							Operator: "Equal",
 						},
+						// control-plane-specific tolerations
+						{
+							Key:      "node-role.kubernetes.io/master",
+							Operator: "Exists",
+							Effect:   "NoSchedule",
+						},
+						{
+							Key:               "node.kubernetes.io/unreachable",
+							Operator:          "Exists",
+							Effect:            "NoExecute",
+							TolerationSeconds: ptr.To[int64](120),
+						},
+						{
+							Key:               "node.kubernetes.io/not-ready",
+							Operator:          "Exists",
+							Effect:            "NoExecute",
+							TolerationSeconds: ptr.To[int64](120),
+						},
 					},
 				},
 			},

pkg/controller/bundle/bundle_unpacker_test.go

@@ -346,6 +346,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										"kubernetes.io/os": "linux",
 									},
 									Tolerations: []corev1.Toleration{
+										// arch-specific tolerations
 										{
 											Key:      "kubernetes.io/arch",
 											Value:    "amd64",
@@ -366,6 +367,24 @@ func TestConfigMapUnpacker(t *testing.T) {
 											Value:    "s390x",
 											Operator: "Equal",
 										},
+										// control-plane-specific tolerations
+										{
+											Key:      "node-role.kubernetes.io/master",
+											Operator: "Exists",
+											Effect:   "NoSchedule",
+										},
+										{
+											Key:               "node.kubernetes.io/unreachable",
+											Operator:          "Exists",
+											Effect:            "NoExecute",
+											TolerationSeconds: ptr.To[int64](120),
+										},
+										{
+											Key:               "node.kubernetes.io/not-ready",
+											Operator:          "Exists",
+											Effect:            "NoExecute",
+											TolerationSeconds: ptr.To[int64](120),
+										},
 									},
 								},
 							},
@@ -1132,6 +1151,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										"kubernetes.io/os": "linux",
 									},
 									Tolerations: []corev1.Toleration{
+										// arch-specific tolerations
 										{
 											Key:      "kubernetes.io/arch",
 											Value:    "amd64",
@@ -1152,6 +1172,24 @@ func TestConfigMapUnpacker(t *testing.T) {
 											Value:    "s390x",
 											Operator: "Equal",
 										},
+										// control-plane-specific tolerations
+										{
+											Key:      "node-role.kubernetes.io/master",
+											Operator: "Exists",
+											Effect:   "NoSchedule",
+										},
+										{
+											Key:               "node.kubernetes.io/unreachable",
+											Operator:          "Exists",
+											Effect:            "NoExecute",
+											TolerationSeconds: ptr.To[int64](120),
+										},
+										{
+											Key:               "node.kubernetes.io/not-ready",
+											Operator:          "Exists",
+											Effect:            "NoExecute",
+											TolerationSeconds: ptr.To[int64](120),
+										},
 									},
 								},
 							},