Skip to content

Commit 06d4b3a

Browse files
Merge pull request #17469 from mfojtik/fix-deployment-pod-tolerations
Fix deployer pod tolerations
2 parents dd6a2e2 + e32e851 commit 06d4b3a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

pkg/apps/controller/deployer/deployer_controller.go

+1
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ func (c *DeploymentController) makeDeployerPod(deployment *v1.ReplicationControl
415415
ActiveDeadlineSeconds: &maxDeploymentDurationSeconds,
416416
DNSPolicy: deployment.Spec.Template.Spec.DNSPolicy,
417417
ImagePullSecrets: deployment.Spec.Template.Spec.ImagePullSecrets,
418+
Tolerations: deployment.Spec.Template.Spec.Tolerations,
418419
// Setting the node selector on the deployer pod so that it is created
419420
// on the same set of nodes as the pods.
420421
NodeSelector: deployment.Spec.Template.Spec.NodeSelector,

0 commit comments

Comments
 (0)