Skip to content

Commit

Permalink
Merge pull request #18790 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-18785-to-release-3.9

[release-3.9] Fix initContainer name lookup for ImageChange trigger
  • Loading branch information
openshift-merge-robot committed Mar 30, 2018
2 parents 7df1815 + a7adc66 commit 093f975
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/image/trigger/deploymentconfigs/deploymentconfigs.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func calculateDeploymentConfigTrigger(t appsapi.DeploymentTriggerPolicy, dc *app
})
}
for _, index := range indicesForContainerNames(dc.Spec.Template.Spec.InitContainers, t.ImageChangeParams.ContainerNames) {
fieldPath := fmt.Sprintf("spec.template.spec.initContainers[@name==\"%s\"].image", dc.Spec.Template.Spec.Containers[index].Name)
fieldPath := fmt.Sprintf("spec.template.spec.initContainers[@name==\"%s\"].image", dc.Spec.Template.Spec.InitContainers[index].Name)
triggers = append(triggers, triggerapi.ObjectFieldTrigger{
From: triggerapi.ObjectReference{
Name: from.Name,
Expand Down

0 comments on commit 093f975

Please sign in to comment.