Unverified Commit 9f8d3396 authored by OpenShift Merge Robot's avatar OpenShift Merge Robot Committed by GitHub
Browse files

Merge pull request #213 from Miciah/BZ1701462-deploymentConfigChanged-fix-deleting-tolerations

Bug 1701462: deploymentConfigChanged: Fix deleting tolerations
parents 4635e07a c81677cc
......@@ -286,9 +286,7 @@ func deploymentConfigChanged(current, expected *appsv1.Deployment) (bool, *appsv
updated.Spec.Template.Spec.NodeSelector = expected.Spec.Template.Spec.NodeSelector
updated.Spec.Template.Spec.Containers[0].Env = expected.Spec.Template.Spec.Containers[0].Env
updated.Spec.Template.Spec.Containers[0].Image = expected.Spec.Template.Spec.Containers[0].Image
if expected.Spec.Template.Spec.Tolerations != nil {
updated.Spec.Template.Spec.Tolerations = expected.Spec.Template.Spec.Tolerations
}
updated.Spec.Template.Spec.Tolerations = expected.Spec.Template.Spec.Tolerations
replicas := int32(1)
if expected.Spec.Replicas != nil {
replicas = *expected.Spec.Replicas
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment