Merge pull request #18790 from openshift-cherrypick-robot/cherry-pick-18785-to-release-3.9

openshift-merge-robot · web-flow · commit 093f975991d2 · 2018-03-30T10:49:37.000-04:00
[release-3.9] Fix initContainer name lookup for ImageChange trigger
diff --git a/pkg/image/trigger/deploymentconfigs/deploymentconfigs.go b/pkg/image/trigger/deploymentconfigs/deploymentconfigs.go
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func calculateDeploymentConfigTrigger(t appsapi.DeploymentTriggerPolicy, dc *app`
`66`	`66`	`})`
`67`	`67`	`}`
`68`	`68`	`for _, index := range indicesForContainerNames(dc.Spec.Template.Spec.InitContainers, t.ImageChangeParams.ContainerNames) {`
`69`		`- fieldPath := fmt.Sprintf("spec.template.spec.initContainers[@name==\"%s\"].image", dc.Spec.Template.Spec.Containers[index].Name)`
	`69`	`+ fieldPath := fmt.Sprintf("spec.template.spec.initContainers[@name==\"%s\"].image", dc.Spec.Template.Spec.InitContainers[index].Name)`
`70`	`70`	`triggers = append(triggers, triggerapi.ObjectFieldTrigger{`
`71`	`71`	`From: triggerapi.ObjectReference{`
`72`	`72`	`Name: from.Name,`