Merge pull request #18785 from alexcern/18777_imagechange_initcontainers

Automatic merge from submit-queue (batch tested with PRs 18766, 18785). Fix initContainer name lookup for ImageChange trigger Fixes #18777 (trivial fix)
openshift · Mar 1, 2018 · 6b73cc1 · 6b73cc1
2 parents 90a3588 + d866202
commit 6b73cc1
Showing 1 changed file with 1 addition and 1 deletion.
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,