Merge pull request #46 from dweomer/toleration-cruft

dweomer · web-flow · commit 8b629eaa5f45 · 2020-03-05T12:35:04.000-07:00
remove toleration in controller deployment
diff --git a/e2e/framework/controller/deployment.go b/e2e/framework/controller/deployment.go
@@ -56,13 +56,7 @@ func DeploymentWithTolerations(toleration ...corev1.Toleration) DeploymentOption
 }
 
 func DeploymentDefaultTolerations() DeploymentOption {
-	return DeploymentWithTolerations(
-		corev1.Toleration{
-			Key:      corev1.TaintNodeUnschedulable,
-			Operator: corev1.TolerationOpExists,
-			Effect:   corev1.TaintEffectNoSchedule,
-		},
-	)
+	return DeploymentWithTolerations()
 }
 
 func DeploymentWithServiceAccountName(serviceAcountName string) DeploymentOption {
diff --git a/manifests/system-upgrade-controller.yaml b/manifests/system-upgrade-controller.yaml
@@ -59,10 +59,6 @@ spec:
               - matchExpressions:
                   - {key: "node-role.kubernetes.io/master", operator: In, values: ["true"]}
       serviceAccountName: system-upgrade
-      tolerations:
-        - key: "node.kubernetes.io/unschedulable" # necessary to avoid cordon/drain
-          operator: "Exists"
-          effect: "NoSchedule"
       containers:
         - name: system-upgrade-controller
           image: rancher/system-upgrade-controller:v0.3.1

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,7 @@ func DeploymentWithTolerations(toleration ...corev1.Toleration) DeploymentOption`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func DeploymentDefaultTolerations() DeploymentOption {`
`59`		`- return DeploymentWithTolerations(`
`60`		`- corev1.Toleration{`
`61`		`- Key: corev1.TaintNodeUnschedulable,`
`62`		`- Operator: corev1.TolerationOpExists,`
`63`		`- Effect: corev1.TaintEffectNoSchedule,`
`64`		`- },`
`65`		`- )`
	`59`	`+ return DeploymentWithTolerations()`
`66`	`60`	`}`
`67`	`61`
`68`	`62`	`func DeploymentWithServiceAccountName(serviceAcountName string) DeploymentOption {`