Merge pull request #1143 from deads2k/toleration

OCPBUGS-41527: Add tolerations to survive scheduler taint manager e2e tests on workers

Author: openshift-merge-bot[bot]

pkg/manifests/assets/router/deployment.yaml

@@ -69,6 +69,14 @@ spec:
           - mountPath: /var/run/configmaps/service-ca
             name: service-ca-bundle
             readOnly: true
+      tolerations:
+      # Ensure the pod isn't deleted during serial NoExecuteTaintManager tests.
+      # Remember that NoExecute uses Delete, not Evict, because removing the pod
+      # is non-optional.  This means that PDBs are not honored.
+      - key: "kubernetes.io/e2e-evict-taint-key"
+        operator: "Equal"
+        value: "evictTaintVal"
+        effect: "NoExecute"
       volumes:
       - name: default-certificate
         secret:

pkg/operator/controller/ingress/deployment_test.go

@@ -410,9 +410,15 @@ func Test_desiredRouterDeployment(t *testing.T) {
 	if len(deployment.Spec.Template.Spec.NodeSelector) == 0 {
 		t.Error("router Deployment has no default node selector")
 	}
-	if len(deployment.Spec.Template.Spec.Tolerations) != 0 {
-		t.Errorf("router Deployment has unexpected toleration: %#v",
-			deployment.Spec.Template.Spec.Tolerations)
+	e2eToleration := corev1.Toleration{
+		Key:      "kubernetes.io/e2e-evict-taint-key",
+		Value:    "evictTaintVal",
+		Operator: corev1.TolerationOpEqual,
+		Effect:   corev1.TaintEffectNoExecute,
+	}
+	expectedTolerations := []corev1.Toleration{e2eToleration}
+	if !reflect.DeepEqual(deployment.Spec.Template.Spec.Tolerations, expectedTolerations) {
+		t.Errorf("router Deployment has unexpected tolerations, expected: %#v, got: %#v", expectedTolerations, deployment.Spec.Template.Spec.Tolerations)
 	}
 	tests := []envData{
 		{"NAMESPACE_LABELS", true, "foo=bar"},